[svn-upgrade] Integrating new upstream version, bti (017) upstream/017
authorgregor herrmann <gregoa@debian.org>
Tue, 24 Mar 2009 18:01:39 +0000 (18:01 -0000)
committergregor herrmann <gregoa@debian.org>
Tue, 24 Mar 2009 18:01:39 +0000 (18:01 -0000)
ChangeLog
Makefile
RELEASE-NOTES
bti-bashcompletion
bti-shrink-urls [new file with mode: 0755]
bti.1
bti.c
bti.example
bti.xml

index e96b9ef..63deef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+Summary of changes from v016 to v017
+============================================
+
+Bart Trojanowski (1):
+      fix a bug with shrink_urls() when ran on text that contains no urls
+
+Dave Barry (1):
+      Add support for api page numbers in read mode
+
+Greg Kroah-Hartman (5):
+      Lots of checkpatch cleanups to the code
+      Merge branch 'master' of git://github.com/psykoyiko/bti
+      document the --page option
+      add --page to bti-bashcompletion
+      update bti.1
+
+
+Summary of changes from v015 to v016
+============================================
+
+Bart Trojanowski (6):
+      add make install target
+      add bti --shrink-urls
+      add bti --dry-run option
+      bti.xml and bti.example updates
+      fix an array overrun in shrink_urls()
+      bti-shrink-urls - properly handle urls with :
+
+Greg Kroah-Hartman (3):
+      fix up some compiler warnings due to new patches
+      add new options to bash completion script
+      update bti.1 with new info from xml file
+
+
 Summary of changes from v014 to v015
 ============================================
 
index 994e5e3..b49d1d9 100644 (file)
--- a/Makefile
+++ b/Makefile
 #
 #
 
-VERSION = 015
+VERSION = 017
 
 PROGRAM = bti
+SCRIPTS = bti-shrink-urls
 
 CORE_OBJS = \
        bti.o
@@ -35,7 +36,8 @@ LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 
 XML2_CFLAGS = `xml2-config --cflags`
-override CFLAGS        += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -O2 $(XML2_CFLAGS)
+PCRE_CFLAGS = `pcre-config --cflags`
+override CFLAGS        += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -O2 $(XML2_CFLAGS) $(PCRE_CFLAGS)
 
 WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
@@ -43,6 +45,12 @@ WARNINGS     = -Wstrict-prototypes -Wsign-compare -Wshadow \
 CFLAGS         += $(WARNINGS)
 LDFLAGS                += -Wl,-warn-common,--as-needed
 
+DEST           ?=
+PREFIX         ?= /usr/local
+
+INSTALL                = install
+INSTALL_BIN    = ${INSTALL} -m 0755 -t ${DEST}${PREFIX}/bin
+INSTALL_MAN    = ${INSTALL} -m 0644 -t ${DEST}${PREFIX}/share/man
 
 ifeq ($(strip $(V)),)
        E = @echo
@@ -62,14 +70,14 @@ export E Q
 #LIB_OBJS = -lcurl -lnsl -lssl -lcrypto
 LIB_OBJS = -lcurl -lnsl -lreadline
 LIB_XML2 = `xml2-config --libs`
+LIB_PCRE = `pcre-config --libs`
 
 all:   $(PROGRAM) $(MAN_PAGES)
 
 # "Static Pattern Rule" to build all programs
 bti: %: $(HEADERS) $(GEN_HEADERS) $(CORE_OBJS)
        $(E) "  LD      " $@
-       $(Q) $(LD) $(LDFLAGS) $(CORE_OBJS) -o $@ $(LIB_OBJS) $(LIB_XML2)
-
+       $(Q) $(LD) $(LDFLAGS) $(CORE_OBJS) -o $@ $(LIB_OBJS) $(LIB_XML2) $(LIB_PCRE)
 
 # build the objects
 %.o: %.c $(HEADERS) $(GEN_HEADERS)
@@ -111,3 +119,8 @@ release:
        git archive --format=tar --prefix=bti-$(VERSION)/ HEAD | gzip -9v > bti-$(VERSION).tar.gz
 .PHONY: release
 
+install: all
+       $(E) "  INSTALL  " ${DEST}${PREFIX}
+       ${Q} ${INSTALL_BIN} ${PROGRAM} ${SCRIPTS}
+       ${Q} ${INSTALL_MAN} ${MAN_PAGES}
+.PHONY: install
index 533b88e..5a84ac0 100644 (file)
@@ -1,3 +1,15 @@
+bti 017
+=============
+url shortner bugfix from Bart Trojanowski
+--page option from Dave Barry
+documentation updates
+
+bti 016
+=============
+--dry-run option thanks to Bart Trojanowski
+url shortner script and option thanks to Bart Trojanowski
+make install target thanks to Bart Trojanowski
+
 bti 015
 =============
 --action support, bti now can output data from the twitter
index 3b0f4d4..6855c67 100644 (file)
@@ -5,9 +5,10 @@ _bti()
        cur="${COMP_WORDS[COMP_CWORD]}"
        prev="${COMP_WORDS[COMP_CWORD-1]}"
        if [[ "${cur}" == -* ]] ; then
-               COMPREPLY=( $(compgen -W "-a -A -p -P -H -b -d -v -h
+               COMPREPLY=( $(compgen -W "-a -A -p -P -H -b -d -v -s -n -g -h
                        --account --action --password --proxy --host --bash \
-                       --user --debug --version --help" -- ${cur}) )
+                       --user --debug --dry-run --shrink-urls --page --version \
+                       --help" -- ${cur}) )
        fi
 
        if [[ "${prev}" == "--host" ]] ; then
diff --git a/bti-shrink-urls b/bti-shrink-urls
new file mode 100755 (executable)
index 0000000..aa9eb57
--- /dev/null
@@ -0,0 +1,96 @@
+#!/bin/bash
+# Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+needs_escape=true
+
+while test -n "$1" ; do
+        word="$1"
+        shift
+        case "$word" in
+            --escaped)
+                needs_escape=
+                ;;
+            --help|-h)
+                cat <<END
+bti-shrink-urls - convert URLs to a shorter form using a web service
+
+    $0 [--escaped] [<url>]
+
+Currently only http://2tu.us/ is supported.
+END
+                exit 0
+                ;;
+            *)
+                URL=$word
+                ;;
+        esac
+done
+
+function convert_url() {
+        local url=$1
+        test -n "$url" || return 1
+        test "${url%%:*}" = 'http' || return 1
+
+        local urllen="${#url}"
+
+        # http://en.wikipedia.org/wiki/Percent-encoding
+        if test -n "$needs_escape" ; then
+                url=$(echo "$url" | sed -e 's/\%/%25/g' \
+                                        -e 's/!/%21/g' \
+                                        -e 's/*/%2A/g' \
+                                        -e "s/'/%27/g" \
+                                        -e 's/(/%28/g' \
+                                        -e 's/)/%29/g' \
+                                        -e 's/;/%3B/g' \
+                                        -e 's/:/%3A/g' \
+                                        -e 's/@/%40/g' \
+                                        -e 's/&/%26/g' \
+                                        -e 's/=/%3D/g' \
+                                        -e 's/+/%2B/g' \
+                                        -e 's/\$/%24/g' \
+                                        -e 's/,/%2C/g' \
+                                        -e 's,/,%2F,g' \
+                                        -e 's/?/%3F/g' \
+                                        -e 's/#/%23/g' \
+                                        -e 's/\[/%5B/g' \
+                                        -e 's/]/%5D/g')
+        fi
+
+        # http://2tu.us/
+        local submit="http://2tu.us/?save=y&url=$url"
+
+        local res=$(wget -q -O - "$submit" | awk -F"'" '/Your tight URL is:/ { print $2 }')
+        if test "${res%%:*}" = 'http' -a "${#res}" -lt "$urllen" ; then
+                echo $res
+                return 0
+        fi
+        return 1
+}
+
+function die() {
+        echo >&2 $@
+        exit 1
+}
+
+if test -n "$URL" ; then
+        convert_url "$URL" || die "Failed to shrink '$URL'"
+        exit $?
+fi
+
+test -t 0 && echo >&2 "Type in some urls and I'll try to shrink them for you..."
+while read line ; do
+        convert_url "$line" || echo $line
+done
diff --git a/bti.1 b/bti.1
index ea3b887..d33f2e1 100644 (file)
--- a/bti.1
+++ b/bti.1
@@ -171,7 +171,7 @@ bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
 .SH "Synopsis"
 .fam C
 .HP \w'\fBbti\fR\ 'u
-\fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-bash\fR] [\fB\-\-debug\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
+\fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
 .fam
 .SH "DESCRIPTION"
 .PP
@@ -190,7 +190,7 @@ Specify the password of your twitter\&.com or identi\&.ca account\&.
 .PP
 \fB\-\-action action\fR
 .RS 4
-Specify the action which you want to perform\&.  Valid options are "update" to send a message, "friends" to see your friends timeline, "public" to track public timeline, "replies" to see replies to your messages and "user" to see a specific user timeline\&.
+Specify the action which you want to perform\&. Valid options are "update" to send a message, "friends" to see your friends timeline, "public" to track public timeline, "replies" to see replies to your messages and "user" to see a specific user\'s timeline\&.
 .RE
 .PP
 \fB\-\-user screenname\fR
@@ -217,11 +217,28 @@ If \-\-proxy is not specified but the environment variable \'http_proxy\' is set
 Specify a logfile for bti to write status messages to\&. LOGFILE is in relation to the user\'s home directory, not an absolute path to a file\&.
 .RE
 .PP
+\fB\-\-shrink\-urls\fR
+.RS 4
+Scans the tweet text for valid URL patterns and passes each through the supplied bti\-shrink\-urls script\&. The script will pass the URL to a web service that shrinks the URLs, making it more suitable for micro\-blogging\&.
+.sp
+Currently, only http://2tu\&.us/ is used as a URL shrinking service\&.
+.RE
+.PP
 \fB\-\-debug\fR
 .RS 4
 Print a whole bunch of debugging messages to stdout\&.
 .RE
 .PP
+\fB\-\-page PAGENUMBER\fR
+.RS 4
+When the action is to retrieve updates, it usually retrieves only one page\&. If this option is used, the page number can be specified\&.
+.RE
+.PP
+\fB\-\-dry\-run\fR
+.RS 4
+Performs all steps that would normally be done for a given action, but will not connect to the service to post or retrieve data\&.
+.RE
+.PP
 \fB\-\-bash\fR
 .RS 4
 Add the working directory and a \'$\' in the tweet message to help specify it is coming from a command line\&. Don\'t put the working directory and the \'$\' in the tweet message\&.
@@ -268,12 +285,12 @@ The twitter\&.com or identi\&.ca account name you wish to use to send this messa
 The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
 .RE
 .PP
-\fBaction\fR
+\fB\-\-action action\fR
 .RS 4
-Specify the action which you want to perform\&.  Valid options are "update" to send a message, "friends" to see your friends timeline, "public" to track public timeline, "replies" to see replies to your messages and "user" to see a specific user timeline\&.
+Specify the action which you want to perform\&. Valid options are "update" to send a message, "friends" to see your friends timeline, "public" to track public timeline, "replies" to see replies to your messages and "user" to see a specific user\'s timeline\&.
 .RE
 .PP
-\fBscreenname\fR
+\fB\-\-user screenname\fR
 .RS 4
 Specify the user you want to see his/her messages while the action is "user"\&.
 .RE
@@ -293,6 +310,11 @@ The http proxy needed to send data out to the Internet\&.
 The logfile name for bti to write what happened to\&. This file is relative to the user\'s home directory\&. If this file is not specified here or on the command line, no logging will be written to the disk\&.
 .RE
 .PP
+\fBshrink\-urls\fR
+.RS 4
+Setting this variable to \'true\' or \'yes\' will enable the URL shrinking feature\&. This is equivalent to using the \-\-shrink\-urls option\&.
+.RE
+.PP
 There is an example config file called
 \FCbti\&.example\F[]
 in the source tree that shows the structure of the file if you need an example to work off of\&.
diff --git a/bti.c b/bti.c
index 8f09356..6fffef5 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
 #include <unistd.h>
 #include <time.h>
 #include <sys/stat.h>
+#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 "bti_version.h"
 
 
@@ -69,6 +73,9 @@ struct session {
        char *logfile;
        char *user;
        int bash;
+       int shrink_urls;
+       int dry_run;
+       int page;
        enum host host;
        enum action action;
 };
@@ -89,11 +96,14 @@ static void display_help(void)
        fprintf(stdout, "  --account accountname\n");
        fprintf(stdout, "  --password password\n");
        fprintf(stdout, "  --action action\n");
-       fprintf(stdout, "    ('update', 'friends', 'public', 'replies' or 'user')\n");
+       fprintf(stdout, "    ('update', 'friends', 'public', 'replies' "
+               "or 'user')\n");
        fprintf(stdout, "  --user screenname\n");
        fprintf(stdout, "  --proxy PROXY:PORT\n");
        fprintf(stdout, "  --host HOST\n");
        fprintf(stdout, "  --logfile logfile\n");
+       fprintf(stdout, "  --shrink-urls\n");
+       fprintf(stdout, "  --page PAGENUMBER\n");
        fprintf(stdout, "  --bash\n");
        fprintf(stdout, "  --debug\n");
        fprintf(stdout, "  --version\n");
@@ -224,8 +234,9 @@ static void parse_timeline(char *document)
 {
        xmlDocPtr doc;
        xmlNodePtr current;
-       doc = xmlReadMemory(document, strlen(document), "timeline.xml", NULL, XML_PARSE_NOERROR);
 
+       doc = xmlReadMemory(document, strlen(document), "timeline.xml",
+                           NULL, XML_PARSE_NOERROR);
        if (doc == NULL)
                return;
 
@@ -324,10 +335,12 @@ static int send_request(struct session *session)
                curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
                switch (session->host) {
                case HOST_TWITTER:
-                       curl_easy_setopt(curl, CURLOPT_URL, twitter_update_url);
+                       curl_easy_setopt(curl, CURLOPT_URL,
+                                        twitter_update_url);
                        break;
                case HOST_IDENTICA:
-                       curl_easy_setopt(curl, CURLOPT_URL, identica_update_url);
+                       curl_easy_setopt(curl, CURLOPT_URL,
+                                        identica_update_url);
                        break;
                }
                curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
@@ -338,10 +351,12 @@ static int send_request(struct session *session)
                         session->account, session->password);
                switch (session->host) {
                case HOST_TWITTER:
-                       curl_easy_setopt(curl, CURLOPT_URL, twitter_friends_url);
+                       sprintf(user_url, "%s?page=%d", twitter_friends_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                case HOST_IDENTICA:
-                       curl_easy_setopt(curl, CURLOPT_URL, identica_friends_url);
+                       sprintf(user_url, "%s?page=%d", identica_friends_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                }
                curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
@@ -350,11 +365,11 @@ static int send_request(struct session *session)
        case ACTION_USER:
                switch (session->host) {
                case HOST_TWITTER:
-                       sprintf(user_url, "%s%s.xml", twitter_user_url, session->user);
+                       sprintf(user_url, "%s%s.xml?page=%d", twitter_user_url, session->user, session->page);
                        curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                case HOST_IDENTICA:
-                       sprintf(user_url, "%s%s.xml", identica_user_url, session->user);
+                       sprintf(user_url, "%s%s.xml?page=%d", identica_user_url, session->user, session->page);
                        curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                }
@@ -365,10 +380,12 @@ static int send_request(struct session *session)
                         session->account, session->password);
                switch (session->host) {
                case HOST_TWITTER:
-                       curl_easy_setopt(curl, CURLOPT_URL, twitter_replies_url);
+                       sprintf(user_url, "%s?page=%d", twitter_replies_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                case HOST_IDENTICA:
-                       curl_easy_setopt(curl, CURLOPT_URL, identica_replies_url);
+                       sprintf(user_url, "%s?page=%d", identica_replies_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                }
                curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
@@ -377,10 +394,12 @@ static int send_request(struct session *session)
        case ACTION_PUBLIC:
                switch (session->host) {
                case HOST_TWITTER:
-                       curl_easy_setopt(curl, CURLOPT_URL, twitter_public_url);
+                       sprintf(user_url, "%s?page=%d", twitter_public_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                case HOST_IDENTICA:
-                       curl_easy_setopt(curl, CURLOPT_URL, identica_public_url);
+                       sprintf(user_url, "%s?page=%d", identica_public_url, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, user_url);
                        break;
                }
 
@@ -401,10 +420,13 @@ static int send_request(struct session *session)
 
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
        curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
-       res = curl_easy_perform(curl);
-       if (res && !session->bash) {
-               fprintf(stderr, "error(%d) trying to perform operation\n", res);
-               return -EINVAL;
+       if (!session->dry_run) {
+               res = curl_easy_perform(curl);
+               if (res && !session->bash) {
+                       fprintf(stderr, "error(%d) trying to perform "
+                               "operation\n", res);
+                       return -EINVAL;
+               }
        }
 
        curl_easy_cleanup(curl);
@@ -427,6 +449,7 @@ static void parse_configfile(struct session *session)
        char *action = NULL;
        char *user = NULL;
        char *file;
+       int shrink_urls = 0;
 
        /* config file is ~/.bti  */
        file = alloca(strlen(session->homedir) + 7);
@@ -492,6 +515,12 @@ static void parse_configfile(struct session *session)
                        c += 5;
                        if (c[0] != '\0')
                                user = strdup(c);
+               } else if (!strncasecmp(c, "shrink-urls", 11) &&
+                               (c[11] == '=')) {
+                       c += 12;
+                       if (!strncasecmp(c, "true", 4) ||
+                                       !strncasecmp(c, "yes", 3))
+                               shrink_urls = 1;
                }
        } while (!feof(config_file));
 
@@ -528,9 +557,9 @@ static void parse_configfile(struct session *session)
                        session->action = ACTION_UNKNOWN;
                free(action);
        }
-       if (user) {
+       if (user)
                session->user = user;
-       }
+       session->shrink_urls = shrink_urls;
 
        /* Free buffer and close file.  */
        free(line);
@@ -615,6 +644,268 @@ static char *get_string_from_stdin(void)
        return string;
 }
 
+static int find_urls(const char *tweet, int **pranges)
+{
+       /*
+        * magic obtained from
+        * http://www.geekpedia.com/KB65_How-to-validate-an-URL-using-RegEx-in-Csharp.html
+        */
+       static const char *re_magic =
+               "(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{1,3}"
+               "[0-9a-zA-Z;/~?:@&=+$\\.\\-_'()%]+)"
+               "(#[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)?";
+       pcre *re;
+       const char *errptr;
+       int erroffset;
+       int ovector[10] = {0,};
+       const size_t ovsize = sizeof(ovector)/sizeof(*ovector);
+       int startoffset, tweetlen;
+       int i, rc;
+       int rbound = 10;
+       int rcount = 0;
+       int *ranges = malloc(sizeof(int) * rbound);
+
+       re = pcre_compile(re_magic,
+                       PCRE_NO_AUTO_CAPTURE,
+                       &errptr, &erroffset, NULL);
+       if (!re) {
+               fprintf(stderr, "pcre_compile @%u: %s\n", erroffset, errptr);
+               exit(1);
+       }
+
+       tweetlen = strlen(tweet);
+       for (startoffset = 0; startoffset < tweetlen; ) {
+
+               rc = pcre_exec(re, NULL, tweet, strlen(tweet), startoffset, 0,
+                               ovector, ovsize);
+               if (rc == PCRE_ERROR_NOMATCH)
+                       break;
+
+               if (rc < 0) {
+                       fprintf(stderr, "pcre_exec @%u: %s\n",
+                               erroffset, errptr);
+                       exit(1);
+               }
+
+               for (i = 0; i < rc; i += 2) {
+                       if ((rcount+2) == rbound) {
+                               rbound *= 2;
+                               ranges = realloc(ranges, sizeof(int) * rbound);
+                       }
+
+                       ranges[rcount++] = ovector[i];
+                       ranges[rcount++] = ovector[i+1];
+               }
+
+               startoffset = ovector[1];
+       }
+
+       pcre_free(re);
+
+       *pranges = ranges;
+       return rcount;
+}
+
+/**
+ * bidirectional popen() call
+ *
+ * @param rwepipe - int array of size three
+ * @param exe - program to run
+ * @param argv - argument list
+ * @return pid or -1 on error
+ *
+ * The caller passes in an array of three integers (rwepipe), on successful
+ * execution it can then write to element 0 (stdin of exe), and read from
+ * element 1 (stdout) and 2 (stderr).
+ */
+static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])
+{
+       int in[2];
+       int out[2];
+       int err[2];
+       int pid;
+       int rc;
+
+       rc = pipe(in);
+       if (rc < 0)
+               goto error_in;
+
+       rc = pipe(out);
+       if (rc < 0)
+               goto error_out;
+
+       rc = pipe(err);
+       if (rc < 0)
+               goto error_err;
+
+       pid = fork();
+       if (pid > 0) {
+               /* parent */
+               close(in[0]);
+               close(out[1]);
+               close(err[1]);
+               rwepipe[0] = in[1];
+               rwepipe[1] = out[0];
+               rwepipe[2] = err[0];
+               return pid;
+       } else if (pid == 0) {
+               /* child */
+               close(in[1]);
+               close(out[0]);
+               close(err[0]);
+               close(0);
+               rc = dup(in[0]);
+               close(1);
+               rc = dup(out[1]);
+               close(2);
+               rc = dup(err[1]);
+
+               execvp(exe, (char **)argv);
+               exit(1);
+       } else
+               goto error_fork;
+
+       return pid;
+
+error_fork:
+       close(err[0]);
+       close(err[1]);
+error_err:
+       close(out[0]);
+       close(out[1]);
+error_out:
+       close(in[0]);
+       close(in[1]);
+error_in:
+       return -1;
+}
+
+static int pcloseRWE(int pid, int *rwepipe)
+{
+       int rc, status;
+       close(rwepipe[0]);
+       close(rwepipe[1]);
+       close(rwepipe[2]);
+       rc = waitpid(pid, &status, 0);
+       return status;
+}
+
+static char *shrink_one_url(int *rwepipe, char *big)
+{
+       int biglen = strlen(big);
+       char *small;
+       int smalllen;
+       int rc;
+
+       rc = dprintf(rwepipe[0], "%s\n", big);
+       if (rc < 0)
+               return big;
+
+       smalllen = biglen + 128;
+       small = malloc(smalllen);
+       if (!small)
+               return big;
+
+       rc = read(rwepipe[1], small, smalllen);
+       if (rc < 0 || rc > biglen)
+               goto error_free_small;
+
+       if (strncmp(small, "http://", 7))
+               goto error_free_small;
+
+       smalllen = rc;
+       while (smalllen && isspace(small[smalllen-1]))
+                       small[--smalllen] = 0;
+
+       free(big);
+       return small;
+
+error_free_small:
+       free(small);
+       return big;
+}
+
+static char *shrink_urls(char *text)
+{
+       int *ranges;
+       int rcount;
+       int i;
+       int inofs = 0;
+       int outofs = 0;
+       const char *const shrink_args[] = {
+               "bti-shrink-urls",
+               NULL
+       };
+       int shrink_pid;
+       int shrink_pipe[3];
+       int inlen = strlen(text);
+
+       dbg("before len=%u\n", inlen);
+
+       shrink_pid = popenRWE(shrink_pipe, shrink_args[0], shrink_args);
+       if (shrink_pid < 0)
+               return text;
+
+       rcount = find_urls(text, &ranges);
+       if (!rcount)
+               return text;
+
+       for (i = 0; i < rcount; i += 2) {
+               int url_start = ranges[i];
+               int url_end = ranges[i+1];
+               int long_url_len = url_end - url_start;
+               char *url = strndup(text + url_start, long_url_len);
+               int short_url_len;
+               int not_url_len = url_start - inofs;
+
+               dbg("long  url[%u]: %s\n", long_url_len, url);
+               url = shrink_one_url(shrink_pipe, url);
+               short_url_len = url ? strlen(url) : 0;
+               dbg("short url[%u]: %s\n", short_url_len, url);
+
+               if (!url || short_url_len >= long_url_len) {
+                       /* The short url ended up being too long
+                        * or unavailable */
+                       if (inofs) {
+                               strncpy(text + outofs, text + inofs,
+                                               not_url_len + long_url_len);
+                       }
+                       inofs += not_url_len + long_url_len;
+                       outofs += not_url_len + long_url_len;
+
+               } else {
+                       /* copy the unmodified block */
+                       strncpy(text + outofs, text + inofs, not_url_len);
+                       inofs += not_url_len;
+                       outofs += not_url_len;
+
+                       /* copy the new url */
+                       strncpy(text + outofs, url, short_url_len);
+                       inofs += long_url_len;
+                       outofs += short_url_len;
+               }
+
+               free(url);
+       }
+
+       /* copy the last block after the last match */
+       if (inofs) {
+               int tail = inlen - inofs;
+               if (tail) {
+                       strncpy(text + outofs, text + inofs, tail);
+                       outofs += tail;
+               }
+       }
+
+       free(ranges);
+
+       (void)pcloseRWE(shrink_pid, shrink_pipe);
+
+       text[outofs] = 0;
+       dbg("after len=%u\n", outofs);
+       return text;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
        static const struct option options[] = {
@@ -626,8 +917,11 @@ int main(int argc, char *argv[], char *envp[])
                { "action", 1, NULL, 'A' },
                { "user", 1, NULL, 'u' },
                { "logfile", 1, NULL, 'L' },
+               { "shrink-urls", 0, NULL, 's' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },
+               { "dry-run", 0, NULL, 'n' },
+               { "page", 1, NULL, 'g' },
                { "version", 0, NULL, 'v' },
                { }
        };
@@ -638,6 +932,7 @@ int main(int argc, char *argv[], char *envp[])
        int option;
        char *http_proxy;
        time_t t;
+       int page_nr;
 
        debug = 0;
        rl_bind_key('\t', rl_insert);
@@ -670,7 +965,7 @@ int main(int argc, char *argv[], char *envp[])
        parse_configfile(session);
 
        while (1) {
-               option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:h",
+               option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:hg:",
                                          options, NULL);
                if (option == -1)
                        break;
@@ -684,6 +979,11 @@ int main(int argc, char *argv[], char *envp[])
                        session->account = strdup(optarg);
                        dbg("account = %s\n", session->account);
                        break;
+               case 'g':
+                       page_nr = atoi(optarg);
+                       dbg("page = %d\n", page_nr);
+                       session->page = page_nr;
+                       break;
                case 'p':
                        if (session->password)
                                free(session->password);
@@ -723,6 +1023,9 @@ int main(int argc, char *argv[], char *envp[])
                        session->logfile = strdup(optarg);
                        dbg("logfile = %s\n", session->logfile);
                        break;
+               case 's':
+                       session->shrink_urls = 1;
+                       break;
                case 'H':
                        if (strcasecmp(optarg, "twitter") == 0)
                                session->host = HOST_TWITTER;
@@ -736,6 +1039,9 @@ int main(int argc, char *argv[], char *envp[])
                case 'h':
                        display_help();
                        goto exit;
+               case 'n':
+                       session->dry_run = 1;
+                       break;
                case 'v':
                        display_version();
                        goto exit;
@@ -747,7 +1053,8 @@ int main(int argc, char *argv[], char *envp[])
 
        if (session->action == ACTION_UNKNOWN) {
                fprintf(stderr, "Unknown action, valid actions are:\n");
-               fprintf(stderr, "'update', 'friends', 'public', 'replies' or 'user'.\n");
+               fprintf(stderr, "'update', 'friends', 'public', "
+                       "'replies' or 'user'.\n");
                goto exit;
        }
 
@@ -771,6 +1078,9 @@ int main(int argc, char *argv[], char *envp[])
                        return -1;
                }
 
+               if (session->shrink_urls)
+                       tweet = shrink_urls(tweet);
+
                session->tweet = zalloc(strlen(tweet) + 10);
                if (session->bash)
                        sprintf(session->tweet, "$ %s", tweet);
@@ -784,6 +1094,8 @@ int main(int argc, char *argv[], char *envp[])
        if (!session->user)
                session->user = strdup(session->account);
 
+       if (session->page == 0)
+               session->page = 1;
        dbg("account = %s\n", session->account);
        dbg("password = %s\n", session->password);
        dbg("host = %d\n", session->host);
index e4bbad8..dd4f764 100644 (file)
@@ -10,3 +10,4 @@ logfile=.bti.log
 #action=update
 #user=gregkh
 #proxy=http://localhost:8080
+#shrink-urls=yes
diff --git a/bti.xml b/bti.xml
index d103228..cfd0b1e 100644 (file)
--- a/bti.xml
+++ b/bti.xml
           <arg><option>--host HOST_NAME</option></arg>
           <arg><option>--proxy PROXY:PORT</option></arg>
           <arg><option>--logfile LOGFILE</option></arg>
+          <arg><option>--page PAGENUMBER</option></arg>
           <arg><option>--bash</option></arg>
+          <arg><option>--shrink-urls</option></arg>
           <arg><option>--debug</option></arg>
+          <arg><option>--dry-run</option></arg>
           <arg><option>--version</option></arg>
           <arg><option>--help</option></arg>
         </cmdsynopsis>
               </para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--shrink-urls</option></term>
+            <listitem>
+              <para>
+                Scans the tweet text for valid URL patterns and passes each
+                through the supplied bti-shrink-urls script.  The script will
+                pass the URL to a web service that shrinks the URLs, making it
+                more suitable for micro-blogging.
+              </para>
+              <para>
+                Currently, only http://2tu.us/ is used as a URL shrinking service.
+              </para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--debug</option></term>
             <listitem>
               <para>Print a whole bunch of debugging messages to stdout.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--page PAGENUMBER</option></term>
+            <listitem>
+              <para>
+               When the action is to retrieve updates, it usually retrieves
+               only one page.  If this option is used, the page number can be
+               specified.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><option>--dry-run</option></term>
+            <listitem>
+              <para>
+                Performs all steps that would normally be done for a given
+                action, but will not connect to the service to post or retrieve data.
+              </para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--bash</option></term>
             <listitem>
                </para>
              </listitem>
            </varlistentry>
+           <varlistentry>
+             <term><option>shrink-urls</option></term>
+             <listitem>
+               <para>
+                 Setting this variable to 'true' or 'yes' will enable the URL
+                 shrinking feature.  This is equivalent to using the
+                 --shrink-urls option.
+               </para>
+             </listitem>
+           </varlistentry>
          </variablelist>
          <para>
            There is an example config file called