Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / fs / gnunet-download-manager.scm

diff --git a/src/fs/gnunet-download-manager.scm b/src/fs/gnunet-download-manager.scm
index 80d04fa129fbc0d22c33056c6a9cde0c8e5df27a..a7cacffd95572b7d5624345bb1c30879adb3633a 100755 (executable)
--- a/src/fs/gnunet-download-manager.scm
+++ b/src/fs/gnunet-download-manager.scm
@@ -17,7 +17,7 @@ exec guile -e main -s "$0" "$@"
 ;;;   
 ;;;    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
 
 ;;; Remember ongoing GNUnet downloads so as to be able to resume them
 ;;; later.  Typical usage is to define the following alias in your
@@ -82,9 +82,9 @@ exec guile -e main -s "$0" "$@"
 
 ;; Regexps matching GNUnet URIs
 (define *uri-base*
-  "([[:alnum:]]+)\.([[:alnum:]]+)\.([[:alnum:]]+)\.([0-9]+)")
+  "([[:alnum:]]+).([[:alnum:]]+).([[:alnum:]]+).([0-9]+)")
 (define *uri-re*
-  (make-regexp (string-append "^gnunet://afs/" *uri-base* "$")
+  (make-regexp (string-append "^gnunet://fs/chk/" *uri-base* "$")
               regexp/extended))
 (define *uri-status-file-re*
   (make-regexp (string-append "^" *uri-base* "$")
@@ -281,7 +281,7 @@ arguments."
                                         "<unknown>"))))
            (map (lambda (file)
                   (uri-status *status-directory*
-                              (string-append "gnunet://afs/" file)))
+                              (string-append "gnunet://fs/chk/" file)))
                 (uri-status-files *status-directory*))))
 
 (define (resume-command . args)
@@ -297,7 +297,7 @@ arguments."
                        (exit code)))))
            (map (lambda (file)
                   (uri-status *status-directory*
-                              (string-append "gnunet://afs/" file)))
+                              (string-append "gnunet://fs/chk/" file)))
                 (uri-status-files *status-directory*))))
 
 (define (killall-command . args)
@@ -312,7 +312,7 @@ arguments."
                         (kill dl-pid 15)))))
            (map (lambda (file)
                   (uri-status *status-directory*
-                              (string-append "gnunet://afs/" file)))
+                              (string-append "gnunet://fs/chk/" file)))
                 (uri-status-files *status-directory*))))
 
 
@@ -404,4 +404,4 @@ arguments."
        (if command
            (apply command (cddr args))
            (and (gnunet-info "~a command not found" command-name)
-                (exit 1))))))
\ No newline at end of file
+                (exit 1))))))