]> ToastFreeware Gitweb - gregoa/bti.git/blobdiff - bti.c
minor coding style cleanup.
[gregoa/bti.git] / bti.c
diff --git a/bti.c b/bti.c
index 2c2f4bee5f490688418e4962e4398452d8971bd1..201d56fc0858d292896fbec02af510259a1df90b 100644 (file)
--- a/bti.c
+++ b/bti.c
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <curl/curl.h>
-#include <readline/readline.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <pcre.h>
 #include <termios.h>
+#include <dlfcn.h>
 
 
 #define zalloc(size)   calloc(size, 1)
@@ -81,12 +81,16 @@ struct session {
        char *user;
        char *group;
        char *hosturl;
+       char *hostname;
        int bash;
+       int interactive;
        int shrink_urls;
        int dry_run;
        int page;
        enum host host;
        enum action action;
+       void *readline_handle;
+       char *(*readline)(const char *);
 };
 
 struct bti_curl_buffer {
@@ -127,6 +131,102 @@ static void display_version(void)
        fprintf(stdout, "bti - version %s\n", VERSION);
 }
 
+static char *get_string(const char *name)
+{
+       char *temp;
+       char *string;
+
+       string = zalloc(1000);
+       if (!string)
+               exit(1);
+       if (name != NULL)
+               fprintf(stdout, "%s", name);
+       if (!fgets(string, 999, stdin))
+               return NULL;
+       temp = strchr(string, '\n');
+       if (temp)
+               *temp = '\0';
+       return string;
+}
+
+/*
+ * Try to get a handle to a readline function from a variety of different
+ * libraries.  If nothing is present on the system, then fall back to an
+ * internal one.
+ *
+ * Logic originally based off of code in the e2fsutils package in the
+ * 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.
+ * 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.
+ */
+static void session_readline_init(struct session *session)
+{
+       /* Libraries we will try to use for readline/editline functionality */
+       const char *libpath = "libreadline.so.6:libreadline.so.5:"
+                               "libreadline.so.4:libreadline.so:libedit.so.2:"
+                               "libedit.so:libeditline.so.0:libeditline.so";
+       void *handle = NULL;
+       char *tmp, *cp, *next;
+       int (*bind_key)(int, void *);
+       void (*insert)(void);
+
+       /* default to internal function if we can't or won't find anything */
+       session->readline = get_string;
+       if (!isatty(0))
+               return;
+       session->interactive = 1;
+
+       tmp = malloc(strlen(libpath)+1);
+       if (!tmp)
+               return;
+       strcpy(tmp, libpath);
+       for (cp = tmp; cp; cp = next) {
+               next = strchr(cp, ':');
+               if (next)
+                       *next++ = 0;
+               if (*cp == 0)
+                       continue;
+               handle = dlopen(cp, RTLD_NOW);
+               if (handle) {
+                       dbg("Using %s for readline library\n", cp);
+                       break;
+               }
+       }
+       free(tmp);
+       if (!handle) {
+               dbg("No readline library found.\n");
+               return;
+       }
+
+       session->readline_handle = handle;
+       session->readline = (char *(*)(const char *))dlsym(handle, "readline");
+       if (session->readline == NULL) {
+               /* something odd happened, default back to internal stuff */
+               session->readline_handle = NULL;
+               session->readline = get_string;
+               return;
+       }
+
+       /*
+        * If we found a library, turn off filename expansion
+        * as that makes no sense from within bti.
+        */
+       bind_key = (int (*)(int, void *))dlsym(handle, "rl_bind_key");
+       insert = (void (*)(void))dlsym(handle, "rl_insert");
+       if (bind_key && insert)
+               bind_key('\t', insert);
+}
+
+static void session_readline_cleanup(struct session *session)
+{
+       if (session->readline_handle)
+               dlclose(session->readline_handle);
+}
+
 static struct session *session_alloc(void)
 {
        struct session *session;
@@ -134,6 +234,7 @@ static struct session *session_alloc(void)
        session = zalloc(sizeof(*session));
        if (!session)
                return NULL;
+       session_readline_init(session);
        return session;
 }
 
@@ -141,6 +242,7 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
+       session_readline_cleanup(session);
        free(session->password);
        free(session->account);
        free(session->tweet);
@@ -150,6 +252,7 @@ static void session_free(struct session *session)
        free(session->user);
        free(session->group);
        free(session->hosturl);
+       free(session->hostname);
        free(session);
 }
 
@@ -183,6 +286,8 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
 
 static const char *twitter_host  = "https://twitter.com/statuses";
 static const char *identica_host = "https://identi.ca/api/statuses";
+static const char *twitter_name  = "twitter";
+static const char *identica_name = "identi.ca";
 
 static const char *user_uri    = "/user_timeline/";
 static const char *update_uri  = "/update.xml";
@@ -535,12 +640,15 @@ static void parse_configfile(struct session *session)
                if (strcasecmp(host, "twitter") == 0) {
                        session->host = HOST_TWITTER;
                        session->hosturl = strdup(twitter_host);
+                       session->hostname = strdup(twitter_name);
                } else if (strcasecmp(host, "identica") == 0) {
                        session->host = HOST_IDENTICA;
                        session->hosturl = strdup(identica_host);
+                       session->hostname = strdup(identica_name);
                } else {
                        session->host = HOST_CUSTOM;
                        session->hosturl = strdup(host);
+                       session->hostname = strdup(host);
                }
                free(host);
        }
@@ -581,7 +689,6 @@ static void log_session(struct session *session, int retval)
 {
        FILE *log_file;
        char *filename;
-       char *host;
 
        /* Only log something if we have a log file set */
        if (!session->logfile)
@@ -595,46 +702,35 @@ static void log_session(struct session *session, int retval)
        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 = session->hosturl;
-               break;
-       }
 
        switch (session->action) {
        case ACTION_UPDATE:
                if (retval)
                        fprintf(log_file, "%s: host=%s tweet failed\n",
-                               session->time, host);
+                               session->time, session->hostname);
                else
                        fprintf(log_file, "%s: host=%s tweet=%s\n",
-                               session->time, host, session->tweet);
+                               session->time, session->hostname, session->tweet);
                break;
        case ACTION_FRIENDS:
                fprintf(log_file, "%s: host=%s retrieving friends timeline\n",
-                       session->time, host);
+                       session->time, session->hostname);
                break;
        case ACTION_USER:
                fprintf(log_file, "%s: host=%s retrieving %s's timeline\n",
-                       session->time, host, session->user);
+                       session->time, session->hostname, session->user);
                break;
        case ACTION_REPLIES:
                fprintf(log_file, "%s: host=%s retrieving replies\n",
-                       session->time, host);
+                       session->time, session->hostname);
                break;
        case ACTION_PUBLIC:
                fprintf(log_file, "%s: host=%s retrieving public timeline\n",
-                       session->time, host);
+                       session->time, session->hostname);
                break;
        case ACTION_GROUP:
                fprintf(log_file, "%s: host=%s retrieving group timeline\n",
-                       session->time, host);
+                       session->time, session->hostname);
                break;
        default:
                break;
@@ -655,13 +751,15 @@ static char *get_string_from_stdin(void)
        if (!fgets(string, 999, stdin))
                return NULL;
        temp = strchr(string, '\n');
-       *temp = '\0';
+       if (temp)
+               *temp = '\0';
        return string;
 }
 
-void read_password(char *buf, size_t len)
+static void read_password(char *buf, size_t len, char *host)
 {
        char pwd[80];
+       int retval;
        struct termios old;
        struct termios tp;
 
@@ -671,9 +769,11 @@ void read_password(char *buf, size_t len)
        tp.c_lflag &= (~ECHO);
        tcsetattr(0, TCSANOW, &tp);
 
-       fprintf(stdout, "Enter password: ");
+       fprintf(stdout, "Enter password for %s: ", host);
        fflush(stdout);
-       scanf("%79s", pwd);
+       tcflow(0, TCOOFF);
+       retval = scanf("%79s", pwd);
+       tcflow(0, TCOON);
        fprintf(stdout, "\n");
 
        tcsetattr(0, TCSANOW, &old);
@@ -977,7 +1077,6 @@ int main(int argc, char *argv[], char *envp[])
 
        debug = 0;
        verbose = 0;
-       rl_bind_key('\t', rl_insert);
 
        session = session_alloc();
        if (!session) {
@@ -1083,15 +1182,20 @@ int main(int argc, char *argv[], char *envp[])
                case 'H':
                        if (session->hosturl)
                                free(session->hosturl);
+                       if (session->hostname)
+                               free(session->hostname);
                        if (strcasecmp(optarg, "twitter") == 0) {
                                session->host = HOST_TWITTER;
                                session->hosturl = strdup(twitter_host);
+                               session->hostname = strdup(twitter_name);
                        } else if (strcasecmp(optarg, "identica") == 0) {
                                session->host = HOST_IDENTICA;
                                session->hosturl = strdup(identica_host);
+                               session->hostname = strdup(identica_name);
                        } else {
                                session->host = HOST_CUSTOM;
                                session->hosturl = strdup(optarg);
+                               session->hostname = strdup(optarg);
                        }
                        dbg("host = %d\n", session->host);
                        break;
@@ -1134,24 +1238,24 @@ int main(int argc, char *argv[], char *envp[])
 
        if (session->action == ACTION_GROUP && !session->group) {
                fprintf(stdout, "Enter group name: ");
-               session->group = readline(NULL);
+               session->group = session->readline(NULL);
        }
 
        if (!session->account) {
-               fprintf(stdout, "Enter account: ");
-               session->account = readline(NULL);
+               fprintf(stdout, "Enter account for %s: ", session->hostname);
+               session->account = session->readline(NULL);
        }
 
        if (!session->password) {
-               read_password(password, sizeof(password));
+               read_password(password, sizeof(password), session->hostname);
                session->password = strdup(password);
        }
 
        if (session->action == ACTION_UPDATE) {
-               if (session->bash)
+               if (session->bash || !session->interactive)
                        tweet = get_string_from_stdin();
                else
-                       tweet = readline("tweet: ");
+                       tweet = session->readline("tweet: ");
                if (!tweet || strlen(tweet) == 0) {
                        dbg("no tweet?\n");
                        return -1;