Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asdf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Moringen
asdf
Commits
a1ead0db
Commit
a1ead0db
authored
11 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
Some fixes to CLISP on Windows: use ext:probe-pathname, not posix:file-stat;
use ext:run-program, not ext:shell.
parent
ecff62c7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
test/test-run-program.script
+5
-0
5 additions, 0 deletions
test/test-run-program.script
uiop/filesystem.lisp
+1
-1
1 addition, 1 deletion
uiop/filesystem.lisp
uiop/run-program.lisp
+10
-7
10 additions, 7 deletions
uiop/run-program.lisp
with
16 additions
and
8 deletions
test/test-run-program.script
+
5
−
0
View file @
a1ead0db
;; -*- Lisp -*-
(declaim (optimize (debug 3) (safety #-gcl 3 #+gcl 0)))
#+(and clisp os-windows)
(ext:without-package-lock ()
(trace uiop:run-program uiop/run-program::%run-program uiop/run-program::%system
ext:shell ext:run-shell-command ext:run-program))
;; On Windows, normalize away CRLF into jut the unixy LF.
(defun dewindowize (x)
(block ()
...
...
This diff is collapsed.
Click to expand it.
uiop/filesystem.lisp
+
1
−
1
View file @
a1ead0db
...
...
@@ -116,7 +116,7 @@ or the original (parsed) pathname if it is false (the default)."
(
cond
(
truename
foundtrue
)
(
foundtrue
p
)))))
(
let*
((
fs
(
find-symbol*
'
#:file-stat
:posix
nil
))
(
let*
((
fs
(
or
#-
os-windows
(
find-symbol*
'
#:file-stat
:posix
nil
))
)
(
pp
(
find-symbol*
'
#:probe-pathname
:ext
nil
))
(
resolve
(
if
pp
`
(
ignore-errors
(
,
pp
p
))
...
...
This diff is collapsed.
Click to expand it.
uiop/run-program.lisp
+
10
−
7
View file @
a1ead0db
...
...
@@ -410,7 +410,7 @@ It returns a process-info plist with possible keys:
;; NB: these implementations have unix vs windows set at compile-time.
(
declare
(
ignorable
if-input-does-not-exist
if-output-exists
if-error-output-exists
))
(
assert
(
not
(
and
wait
(
member
:stream
(
list
input
output
error-output
)))))
#-
(
or
allegro
clozure
cmu
(
and
lispworks
os-unix
)
sbcl
scl
)
#-
(
or
allegro
clisp
clozure
cmu
(
and
lispworks
os-unix
)
sbcl
scl
)
(
progn
command
keys
directory
(
error
"run-program not available"
))
#+
(
or
allegro
clisp
clozure
cmu
(
and
lispworks
os-unix
)
sbcl
scl
)
...
...
@@ -435,10 +435,10 @@ It returns a process-info plist with possible keys:
#-
allegro
(
with-current-directory
(
#-
sbcl
directory
)
#+
clisp
(
flet
((
run
(
f
&rest
args
)
(
flet
((
run
(
f
x
&rest
args
)
(
multiple-value-list
(
apply
f
:input
%input
:output
%output
:allow-other-keys
t
`
(
,@
args
,@
keys
)))))
(
apply
f
x
:input
%input
:output
%output
:allow-other-keys
t
`
(
,@
args
,@
keys
)))))
(
assert
(
eq
%error-output
:terminal
))
;;; since we now always return a code, we can't use this code path, anyway!
(
etypecase
%command
...
...
@@ -769,14 +769,17 @@ It returns a process-info plist with possible keys:
#+
(
or
allegro
clozure
cmu
(
and
lispworks
os-unix
)
sbcl
scl
)
(
%wait-process-result
(
apply
'%run-program
(
%normalize-system-command
command
)
:wait
t
keys
))
#+
(
or
abcl
clisp
c
orman
lisp
ecl
gcl
(
and
lispworks
os-windows
)
mkcl
xcl
)
#+
(
or
abcl
c
orman
lisp
clisp
ecl
gcl
(
and
lispworks
os-windows
)
mkcl
xcl
)
(
let
((
%command
(
%redirected-system-command
command
input
output
error-output
directory
)))
#+
(
and
lispworks
os-windows
)
(
system:call-system
%command
:current-directory
directory
:wait
t
)
#-
(
and
lispworks
os-windows
)
#+
clisp
(
%wait-process-result
(
apply
'%run-program
%command
:wait
t
:input
:interactive
:output
:interactive
:error-output
:interactive
keys
))
#-
(
or
clisp
(
and
lispworks
os-windows
))
(
with-current-directory
((
unless
(
os-unix-p
)
directory
))
#+
abcl
(
ext:run-shell-command
%command
)
#+
clisp
(
clisp-exit-code
(
ext:shell
%command
))
#+
cormanlisp
(
win32:system
%command
)
#+
ecl
(
let
((
*standard-input*
*stdin*
)
(
*standard-output*
*stdout*
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment