search: shutdown the scheduler when Ctrl+C

2 files changed, 13 insertions, 1 deletions

diff --git a/gnunet-guile b/gnunet-guile
index ea6701b..ac37bfe 100755
--- a/gnunet-guile
+++ b/gnunet-guile
@@ -164,6 +164,10 @@ Publish on gnunet FILE using CONFIGURATION using KEYWORDS.
 
 ;;; search
 
+(define (search/task/shutdown search-context)
+  (lambda ()
+    (fs-search-stop search-context)))
+
 (define (search/progress info)
   (let ((status (fs-progress-info-status info)))
     (cond
@@ -177,7 +181,8 @@ Publish on gnunet FILE using CONFIGURATION using KEYWORDS.
 (define (search/task configuration uri)
   (lambda ()
     (let ((fs (fs-start configuration "gnunet-guile" search/progress)))
-      (fs-search-start fs uri 1 %fs-search-option-none))))
+      (let ((search-context (fs-search-start fs uri 1 %fs-search-option-none)))
+        (scheduler-add-shutdown (search/task/shutdown search-context))))))
 
 (define (search-exec configuration keywords)
   (let ((configuration* (configuration-create))
diff --git a/gnunet.scm b/gnunet.scm
index 67e2570..3fbdf47 100644
--- a/gnunet.scm
+++ b/gnunet.scm
@@ -809,6 +809,13 @@ with + if it must be mandatory"
     (lambda (fs uri anonymity options)
       (func fs uri anonymity options ffi:%null-pointer))))
 
+(define-public fs-search-stop
+  (let ((func (fs ffi:void "GNUNET_FS_search_stop" '*)))
+    (lambda (search-context)
+      (func search-context))))
+
+
+
 ;; gnunet-identity bindings
 
 (define identity (dynamic-link* %libgnunet-identity))