Add the cd and pwd built-ins
* geesh/built-ins/cd.scm: New file. * geesh/built-ins/pwd.scm: New file. * Makefile.am: Add them. * geesh/built-ins.scm (*built-ins*): Add cd and pwd.
This commit is contained in:
parent
4ef6907851
commit
271301e77d
|
@ -42,10 +42,12 @@ check-spec:
|
||||||
|
|
||||||
MODULES = \
|
MODULES = \
|
||||||
geesh/built-ins/break.scm \
|
geesh/built-ins/break.scm \
|
||||||
|
geesh/built-ins/cd.scm \
|
||||||
geesh/built-ins/continue.scm \
|
geesh/built-ins/continue.scm \
|
||||||
geesh/built-ins/echo.scm \
|
geesh/built-ins/echo.scm \
|
||||||
geesh/built-ins/export.scm \
|
geesh/built-ins/export.scm \
|
||||||
geesh/built-ins/false.scm \
|
geesh/built-ins/false.scm \
|
||||||
|
geesh/built-ins/pwd.scm \
|
||||||
geesh/built-ins/read.scm \
|
geesh/built-ins/read.scm \
|
||||||
geesh/built-ins/readonly.scm \
|
geesh/built-ins/readonly.scm \
|
||||||
geesh/built-ins/set.scm \
|
geesh/built-ins/set.scm \
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
`( ;; POSIX-specified built-ins.
|
`( ;; POSIX-specified built-ins.
|
||||||
("alias" . ,undefined)
|
("alias" . ,undefined)
|
||||||
("bg" . ,undefined)
|
("bg" . ,undefined)
|
||||||
("cd" . ,undefined)
|
("cd" . ,(@@ (geesh built-ins cd) main))
|
||||||
("command" . ,undefined)
|
("command" . ,undefined)
|
||||||
("false" . ,(@@ (geesh built-ins false) main))
|
("false" . ,(@@ (geesh built-ins false) main))
|
||||||
("fc" . ,undefined)
|
("fc" . ,undefined)
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
("jobs" . ,undefined)
|
("jobs" . ,undefined)
|
||||||
("kill" . ,undefined)
|
("kill" . ,undefined)
|
||||||
("newgrp" . ,undefined)
|
("newgrp" . ,undefined)
|
||||||
("pwd" . ,undefined)
|
("pwd" . ,(@@ (geesh built-ins pwd) main))
|
||||||
("read" . ,(@@ (geesh built-ins read) main))
|
("read" . ,(@@ (geesh built-ins read) main))
|
||||||
("true" . ,(@@ (geesh built-ins true) main))
|
("true" . ,(@@ (geesh built-ins true) main))
|
||||||
("umask" . ,undefined)
|
("umask" . ,undefined)
|
||||||
|
|
|
@ -0,0 +1,109 @@
|
||||||
|
;;; The Geesh Shell Interpreter
|
||||||
|
;;; Copyright 2018 Timothy Sample <samplet@ngyro.com>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of Geesh.
|
||||||
|
;;;
|
||||||
|
;;; Geesh is free software: you can redistribute it and/or modify
|
||||||
|
;;; it under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;;; (at your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; Geesh is distributed in the hope that it will be useful,
|
||||||
|
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with Geesh. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (geesh built-ins cd)
|
||||||
|
#:use-module (geesh environment)
|
||||||
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
;;;
|
||||||
|
;;; The 'cd' utility.
|
||||||
|
;;;
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(define pwd (@@ (geesh built-ins pwd) main))
|
||||||
|
|
||||||
|
(define (directory? path)
|
||||||
|
"Check if @var{path} refers to a directory."
|
||||||
|
(eq? (stat:type (stat path)) 'directory))
|
||||||
|
|
||||||
|
(define (canonicalize-path-logically path)
|
||||||
|
"Canonicalize @var{path} by removing dot components, processing
|
||||||
|
dot-dot components, and removing duplicate slashes (with the exception
|
||||||
|
that if there are exactly two leading slashes, those two are
|
||||||
|
preserved). This differs from @code{canonicalize-path} in that it
|
||||||
|
does not process symbolic links before processing dot-dot components."
|
||||||
|
|
||||||
|
(define char-set:not-slash
|
||||||
|
(char-set-complement (char-set #\/)))
|
||||||
|
|
||||||
|
(define (acc->path acc)
|
||||||
|
(if (null? acc)
|
||||||
|
"/"
|
||||||
|
(string-join (reverse acc) "/" 'prefix)))
|
||||||
|
|
||||||
|
;; XXX: Following POSIX, we should preserve both leading slashes
|
||||||
|
;; when there are exactly two.
|
||||||
|
(let loop ((parts (string-tokenize path char-set:not-slash)) (acc '()))
|
||||||
|
(match parts
|
||||||
|
(() (acc->path acc))
|
||||||
|
(("." . tail) (loop tail acc))
|
||||||
|
((".." . tail) (match acc
|
||||||
|
(() (loop tail acc))
|
||||||
|
((prev . acc-tail)
|
||||||
|
(and (directory? (acc->path acc))
|
||||||
|
(loop tail acc-tail)))))
|
||||||
|
((part . tail) (loop tail (cons part acc))))))
|
||||||
|
|
||||||
|
(define (main . args)
|
||||||
|
(match args
|
||||||
|
(("-")
|
||||||
|
(match (main (getvar "OLDPWD" ""))
|
||||||
|
(0 (pwd))
|
||||||
|
(x x)))
|
||||||
|
(_
|
||||||
|
(let loop ((args args) (logical? #t))
|
||||||
|
(match args
|
||||||
|
(()
|
||||||
|
(match (getvar "HOME")
|
||||||
|
(#f (format (current-error-port)
|
||||||
|
"~a: cd: Could not find home directory.~%"
|
||||||
|
(car (program-arguments)))
|
||||||
|
EXIT_FAILURE)
|
||||||
|
(directory (main directory))))
|
||||||
|
(("-P" . tail) (loop tail #f))
|
||||||
|
(("-L" . tail) (loop tail #t))
|
||||||
|
((or (directory) ("--" directory))
|
||||||
|
(let ((curpath (cond
|
||||||
|
(logical? (canonicalize-path-logically
|
||||||
|
(if (string-prefix? "/" directory)
|
||||||
|
directory
|
||||||
|
(string-append (getvar "PWD")
|
||||||
|
"/" directory))))
|
||||||
|
(else (if (string-prefix? "/" directory)
|
||||||
|
directory
|
||||||
|
(string-append (getcwd)
|
||||||
|
"/" directory))))))
|
||||||
|
(if (catch 'system-error
|
||||||
|
(lambda ()
|
||||||
|
(chdir curpath)
|
||||||
|
#t)
|
||||||
|
(lambda args
|
||||||
|
(format (current-error-port)
|
||||||
|
"~a: cd: ~a: ~a~%"
|
||||||
|
(car (program-arguments)) curpath
|
||||||
|
(strerror (system-error-errno args)))
|
||||||
|
#f))
|
||||||
|
(begin
|
||||||
|
(setvar! "OLDPWD" (getvar "PWD"))
|
||||||
|
(setvar! "PWD" (if logical? curpath (getcwd)))
|
||||||
|
EXIT_SUCCESS)
|
||||||
|
EXIT_FAILURE)))
|
||||||
|
(_ (format (current-error-port)
|
||||||
|
"~a: cd: Invalid arguments."
|
||||||
|
(car (program-arguments)))))))))
|
|
@ -0,0 +1,39 @@
|
||||||
|
;;; The Geesh Shell Interpreter
|
||||||
|
;;; Copyright 2018 Timothy Sample <samplet@ngyro.com>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of Geesh.
|
||||||
|
;;;
|
||||||
|
;;; Geesh is free software: you can redistribute it and/or modify
|
||||||
|
;;; it under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation, either version 3 of the License, or
|
||||||
|
;;; (at your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; Geesh is distributed in the hope that it will be useful,
|
||||||
|
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with Geesh. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
(define-module (geesh built-ins pwd)
|
||||||
|
#:use-module (geesh environment)
|
||||||
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
|
;;; Commentary:
|
||||||
|
;;;
|
||||||
|
;;; The 'pwd' utility.
|
||||||
|
;;;
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(define (main . args)
|
||||||
|
(let loop ((args args) (logical? #t))
|
||||||
|
(match args
|
||||||
|
(("-P" . tail) (loop tail #f))
|
||||||
|
(("-L" . tail) (loop tail #t))
|
||||||
|
(()
|
||||||
|
(display (if logical?
|
||||||
|
(getvar "PWD")
|
||||||
|
(getcwd)))
|
||||||
|
(newline)
|
||||||
|
EXIT_SUCCESS))))
|
Loading…
Reference in New Issue