X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/e1489c76235aade934ce86f7bea709bbafb51730..d6d0d5a3461d22d0acc7f7bdcf382b7b74136648:/bti.c diff --git a/bti.c b/bti.c index 24e359e..fe502bf 100644 --- a/bti.c +++ b/bti.c @@ -33,12 +33,12 @@ #include #include #include -#include #include #include #include #include #include +#include #define zalloc(size) calloc(size, 1) @@ -82,12 +82,17 @@ struct session { char *group; char *hosturl; char *hostname; + char *configfile; + char *replyto; 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 { @@ -113,6 +118,8 @@ static void display_help(void) fprintf(stdout, " --proxy PROXY:PORT\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"); @@ -128,6 +135,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; @@ -142,6 +245,7 @@ static void session_free(struct session *session) { if (!session) return; + free(session->replyto); free(session->password); free(session->account); free(session->tweet); @@ -152,6 +256,7 @@ static void session_free(struct session *session) free(session->group); free(session->hosturl); free(session->hostname); + free(session->configfile); free(session); } @@ -215,6 +320,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) xmlChar *text = NULL; xmlChar *user = NULL; xmlChar *created = NULL; + xmlChar *id = NULL; xmlNodePtr userinfo; current = current->xmlChildrenNode; @@ -224,6 +330,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); + 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) { @@ -236,19 +344,21 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current) } } - if (user && text && created) { + if (user && text && created && id) { 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); + xmlFree(id); user = NULL; text = NULL; created = NULL; + id = NULL; } } current = current->next; @@ -360,6 +470,12 @@ static int send_request(struct session *session) CURLFORM_COPYCONTENTS, "bti", CURLFORM_END); + if (session->replyto) + curl_formadd(&formpost, &lastptr, + CURLFORM_COPYNAME, "in_reply_to_status_id", + CURLFORM_COPYCONTENTS, session->replyto, + CURLFORM_END); + curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); slist = curl_slist_append(slist, "Expect:"); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); @@ -449,15 +565,11 @@ static void parse_configfile(struct session *session) char *logfile = NULL; char *action = NULL; char *user = NULL; + char *replyto = NULL; char *file; int shrink_urls = 0; - /* config file is ~/.bti */ - file = alloca(strlen(session->homedir) + 7); - - sprintf(file, "%s/.bti", session->homedir); - - config_file = fopen(file, "r"); + config_file = fopen(session->configfile, "r"); /* No error if file does not exist or is unreadable. */ if (config_file == NULL) @@ -506,6 +618,11 @@ static void parse_configfile(struct session *session) 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; @@ -558,6 +675,8 @@ static void parse_configfile(struct session *session) } if (logfile) session->logfile = logfile; + if (replyto) + session->replyto = replyto; if (action) { if (strcasecmp(action, "update") == 0) session->action = ACTION_UPDATE; @@ -609,7 +728,8 @@ static void log_session(struct session *session, int retval) session->time, session->hostname); else fprintf(log_file, "%s: host=%s tweet=%s\n", - session->time, session->hostname, session->tweet); + session->time, session->hostname, + session->tweet); break; case ACTION_FRIENDS: fprintf(log_file, "%s: host=%s retrieving friends timeline\n", @@ -650,7 +770,8 @@ 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; } @@ -961,6 +1082,8 @@ int main(int argc, char *argv[], char *envp[]) { "dry-run", 0, NULL, 'n' }, { "page", 1, NULL, 'g' }, { "version", 0, NULL, 'v' }, + { "config", 1, NULL, 'c' }, + { "replyto", 1, NULL, 'r' }, { } }; struct session *session; @@ -975,7 +1098,6 @@ int main(int argc, char *argv[], char *envp[]) debug = 0; verbose = 0; - rl_bind_key('\t', rl_insert); session = session_alloc(); if (!session) { @@ -988,8 +1110,13 @@ 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")); + /* set up a default config file location (traditionally ~/.bti) */ + session->configfile = zalloc(strlen(session->homedir) + 7); + sprintf(session->configfile, "%s/.bti", session->homedir); + curl_global_init(CURL_GLOBAL_ALL); /* Set environment variables first, before reading command line options @@ -1005,7 +1132,7 @@ int main(int argc, char *argv[], char *envp[]) parse_configfile(session); while (1) { - option = getopt_long_only(argc, argv, "dp:P:H:a:A:u: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; @@ -1027,6 +1154,10 @@ int main(int argc, char *argv[], char *envp[]) 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); @@ -1101,6 +1232,18 @@ int main(int argc, char *argv[], char *envp[]) case 'b': session->bash = 1; break; + case 'c': + if (session->configfile) + free(session->configfile); + session->configfile = strdup(optarg); + 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... + */ + parse_configfile(session); + break; case 'h': display_help(); goto exit; @@ -1116,6 +1259,7 @@ int main(int argc, char *argv[], char *envp[]) } } + session_readline_init(session); /* * Show the version to make it easier to determine what * is going on here @@ -1137,12 +1281,12 @@ 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 for %s: ", session->hostname); - session->account = readline(NULL); + session->account = session->readline(NULL); } if (!session->password) { @@ -1151,10 +1295,10 @@ int main(int argc, char *argv[], char *envp[]) } 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; @@ -1179,6 +1323,7 @@ int main(int argc, char *argv[], char *envp[]) if (session->page == 0) session->page = 1; + dbg("config file = %s\n", session->configfile); dbg("account = %s\n", session->account); dbg("password = %s\n", session->password); dbg("host = %d\n", session->host); @@ -1201,6 +1346,7 @@ int main(int argc, char *argv[], char *envp[]) log_session(session, retval); exit: + session_readline_cleanup(session); session_free(session); return retval;; }