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

diff --git a/ChangeLog b/ChangeLog
index 0569a78..fdd3cce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Summary of changes from v006 to v007
+============================================
+
+Greg Kroah-Hartman (4):
+      fix git command in Makefile
+      change README to show that we handle identi.ca also now
+      more README updates
+      Merge branch 'master' of greg@mail.kroah.net:git/bti
+
+Olivier Blin (1):
+      fix segfault when piping to bti and user/password are not set
+
+
 Summary of changes from v005 to v006
 ============================================
 
@@ -5,6 +18,7 @@ Greg Kroah-Hartman (2):
       added github url to the README
       add identi.ca support to bti
 
+
 Summary of changes from v004 to v005
 ============================================
 

diff --git a/Makefile b/Makefile
index 5094286..28809d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #
 #
 
-VERSION = 006
+VERSION = 007
 
 PROGRAM = bti
 
@@ -105,6 +105,6 @@ release:
        git commit -a -m "release $(VERSION)"
        cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
        @ echo
-       git-archive --format=tar --prefix=bti-$(VERSION)/ HEAD | gzip -9v > bti-$(VERSION).tar.gz
+       git archive --format=tar --prefix=bti-$(VERSION)/ HEAD | gzip -9v > bti-$(VERSION).tar.gz
 .PHONY: release
 

diff --git a/README b/README
index b90bd10..ff709f7 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-bti - bash twitter ididocy
+bti - bash twitter/identi.ca ididocy
 
-Allows you to pipe your bash input to twitter in an easy and fast manner
-to annoy the whole world.
+Allows you to pipe your bash input to twitter or identi.ca in an easy
+and fast manner to annoy the whole world.
 
 See the man page bti.1 for how to use it and more information.
 
@@ -11,7 +11,7 @@ data to the world with it.
 USE AT YOUR OWN RISK!
 
 Any questions, contact Greg Kroah-Hartman <greg@kroah.com> or @gregkh
-on twitter.
+on twitter or identi.ca.
 
 bti is developed using git and the tree can be found at:
        git://github.com/gregkh/bti.git

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 29c2666..7f7139a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,7 @@
+bti 007
+=============
+segfault fix from Oliver Blin
+
 bti 006
 =============
 added identi.ca support

diff --git a/bti.c b/bti.c
index ea464f1..941be79 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -418,7 +418,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 #endif
        tweet = get_string_from_stdin();
-       if (strlen(tweet) == 0) {
+       if (!tweet || strlen(tweet) == 0) {
                dbg("no tweet?\n");
                return -1;
        }