SummaryRefsLogTreeCommitDiffStats
path: root/src/mcron
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2016-07-24 00:38:21 +0200
committerMathieu Lirzin <mthl@gnu.org>2016-12-28 22:19:04 +0100
commitd4b4ac5708385d500f566267719124c7c62572df (patch)
tree623a438d81ed7f020838c5079f7f460971b3f11c /src/mcron
parent2d6c072b47a72f9152b2d43d0ffa42f413f15713 (diff)
downloadmcron-d4b4ac5708385d500f566267719124c7c62572df.tar.gz
mcron-d4b4ac5708385d500f566267719124c7c62572df.tar.bz2
mcron-d4b4ac5708385d500f566267719124c7c62572df.zip
utils: Remove unneeded 'stdin->string' procedure.
* src/mcron/utils.scm: Re-export 'read-string'. (stdin->string): Delete. * src/mcron/scripts/crontab.scm (main): Use 'read-string' instead. * src/mcron/scripts/mcron.scm (process-user-file): Likewise.
Diffstat (limited to 'src/mcron')
-rw-r--r--src/mcron/scripts/crontab.scm2
-rw-r--r--src/mcron/scripts/mcron.scm2
-rw-r--r--src/mcron/utils.scm10
3 files changed, 4 insertions, 10 deletions
diff --git a/src/mcron/scripts/crontab.scm b/src/mcron/scripts/crontab.scm
index cf6673a..502fec6 100644
--- a/src/mcron/scripts/crontab.scm
+++ b/src/mcron/scripts/crontab.scm
@@ -210,7 +210,7 @@
(let ((input-file (car (option-ref opts '() '()))))
(catch-mcron-error
(if (string=? input-file "-")
- (let ((input-string (stdin->string)))
+ (let ((input-string (read-string)))
(read-vixie-port (open-input-string input-string))
(with-output-to-file crontab-file
(λ () (display input-string))))
diff --git a/src/mcron/scripts/mcron.scm b/src/mcron/scripts/mcron.scm
index 7b82cf3..b6c7729 100644
--- a/src/mcron/scripts/mcron.scm
+++ b/src/mcron/scripts/mcron.scm
@@ -63,7 +63,7 @@ silently ignored."
(cond ((string=? "-" file-name)
(if (string=? input "vixie")
(read-vixie-port (current-input-port))
- (eval-string (stdin->string))))
+ (eval-string (read-string))))
((or guile-syntax? (regexp-exec guile-regexp file-name))
(load file-name))
((regexp-exec vixie-regexp file-name)
diff --git a/src/mcron/utils.scm b/src/mcron/utils.scm
index ce2610c..062e756 100644
--- a/src/mcron/utils.scm
+++ b/src/mcron/utils.scm
@@ -29,10 +29,10 @@
parse-args
show-version
show-package-information
- stdin->string
for-each-file
process-update-request)
- #:re-export (option-ref))
+ #:re-export (option-ref
+ read-string))
(define (mcron-error exit-code . rest)
"Print an error message (made up from the parts of REST), and if the
@@ -81,12 +81,6 @@ General help using GNU software: <http://www.gnu.org/gethelp/>\n"
config-package-name
config-package-url))
-(define (stdin->string)
- "Return standard input as a string."
- (with-output-to-string (lambda () (do ((in (read-char) (read-char)))
- ((eof-object? in))
- (display in)))))
-
(define (for-each-file proc directory)
"Apply PROC to each file in DIRECTORY. DIRECTORY must be a valid directory name.
PROC must be a procedure that take one file name argument. The return value