[med-svn] [yaggo] 02/07: New upstream version 1.5.10

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository yaggo.

commit 13a8c3116a8db21829fa887d28b557841dd1f275
Author: Andreas Tille <tille at debian.org>
Date:   Thu Oct 5 22:02:47 2017 +0200

    New upstream version 1.5.10
---
 Makefile             | 12 ++++++------
 Rakefile             |  4 +++-
 lib/yaggo/library.rb | 12 ++++++++++++
 lib/yaggo/version.rb |  2 +-
 test/Makefile        | 12 ++++++------
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 73d681a..f97bf63 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ all: bin/create_yaggo_one_file
 	ruby bin/create_yaggo_one_file ./yaggo
 
 install: all
-	mkdir -p $(prefix)/bin
-	mkdir -p $(prefix)/share/doc/yaggo
-	mkdir -p $(prefix)/share/man/man1
-	cp ./yaggo $(prefix)/bin
-	cp ./README.md $(prefix)/share/doc/yaggo
-	./yaggo -m $(prefix)/share/man/man1/yaggo.1
+	mkdir -p $(DESTDIR)$(prefix)/bin
+	mkdir -p $(DESTDIR)$(prefix)/share/doc/yaggo
+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
+	cp ./yaggo $(DESTDIR)$(prefix)/bin
+	cp ./README.md $(DESTDIR)$(prefix)/share/doc/yaggo
+	./yaggo -m $(DESTDIR)$(prefix)/share/man/man1/yaggo.1
diff --git a/Rakefile b/Rakefile
index 99ab75c..477c691 100644
--- a/Rakefile
+++ b/Rakefile
@@ -47,5 +47,7 @@ end
 
 desc "Create a single file executable"
 task :exec do |t|
-  create_binary("lib/yaggo/main.rb", "yaggo")
+  out = "pkg/yaggo"
+  puts("Creating #{out}")
+  create_binary("lib/yaggo/main.rb", out)
 end
diff --git a/lib/yaggo/library.rb b/lib/yaggo/library.rb
index 4dd7bde..4ebeead 100644
--- a/lib/yaggo/library.rb
+++ b/lib/yaggo/library.rb
@@ -44,6 +44,10 @@ def output_conversion_code file
     char *endptr = 0;
     errno = 0;
     double res = strtod(str, &endptr);
+    if(endptr == str) {
+      err.assign("Invalid floating point string");
+      return (double)0.0;
+    }
     if(errno) {
       err.assign(strerror(errno));
       return (double)0.0;
@@ -98,6 +102,10 @@ def output_conversion_code file
     char *endptr = 0;
     errno = 0;
     long long int res = strtoll(str, &endptr, 0);
+    if(endptr == str) {
+      err.assign("Invalid signed int string");
+      return (T)0;
+    }
     if(errno) {
       err.assign(strerror(errno));
       return (T)0;
@@ -126,6 +134,10 @@ def output_conversion_code file
       return (T)0;
     }
     unsigned long long int res = strtoull(str, &endptr, 0);
+    if(endptr == str) {
+      err.assign("Invalid unsigned int string");
+      return (T)0;
+    }
     if(errno) {
       err.assign(strerror(errno));
       return (T)0;
diff --git a/lib/yaggo/version.rb b/lib/yaggo/version.rb
index 02d2e89..6c4dc10 100644
--- a/lib/yaggo/version.rb
+++ b/lib/yaggo/version.rb
@@ -1 +1 @@
-$yaggo_version = "1.5.9"
+$yaggo_version = "1.5.10"
diff --git a/test/Makefile b/test/Makefile
index ebb3ade..c7c8a4c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -7,14 +7,14 @@ RY = ruby -I../lib $(YAGGO)
 all: count
 
 count: count.o
-count_cmdline.hpp _count: count.yaggo $(YAGGO)
+count_cmdline.hpp _count: count_cmdline.yaggo $(YAGGO)
 	$(RY) --debug --zc _count $<
 count.o: count.cpp count_cmdline.hpp
 
-test_errno.hpp: test_errno.yaggo $(YAGGO)
-	$(RY) --debug $<
-test_errno: test_errno.o
-test_errno.o: test_errno.cc test_errno.hpp
+# test_errno.hpp: test_errno.yaggo $(YAGGO)
+# 	$(RY) --debug $<
+# test_errno: test_errno.o
+# test_errno.o: test_errno.cc test_errno.hpp
 
 clean:
-	rm -f *.o count
+	rm -f *.o count *_cmdline.hpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/yaggo.git