diff options
Diffstat (limited to 'lisp/net/tramp-adb.el')
| -rw-r--r-- | lisp/net/tramp-adb.el | 107 |
1 files changed, 51 insertions, 56 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index be231fcba63..b38b908edb0 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -55,7 +55,7 @@ It is used for TCP/IP devices." (defconst tramp-adb-method "adb" "When this method name is used, forward all calls to Android Debug Bridge.") -(defcustom tramp-adb-prompt "^[^#$\n\r]*[#$][[:space:]]" +(defcustom tramp-adb-prompt (rx bol (* (not (any "#$\n\r"))) (any "#$") space) "Regexp used as prompt in almquist shell." :type 'regexp :version "28.1" @@ -63,31 +63,28 @@ It is used for TCP/IP devices." (eval-and-compile (defconst tramp-adb-ls-date-year-regexp - "[[:digit:]]\\{4\\}-[[:digit:]]\\{2\\}-[[:digit:]]\\{2\\}" + (rx (= 4 digit) "-" (= 2 digit) "-" (= 2 digit)) "Regexp for date year format in ls output.")) (eval-and-compile - (defconst tramp-adb-ls-date-time-regexp - "[[:digit:]]\\{2\\}:[[:digit:]]\\{2\\}" + (defconst tramp-adb-ls-date-time-regexp (rx (= 2 digit) ":" (= 2 digit)) "Regexp for date time format in ls output.")) (defconst tramp-adb-ls-date-regexp - (concat - "[[:space:]]" tramp-adb-ls-date-year-regexp - "[[:space:]]" tramp-adb-ls-date-time-regexp - "[[:space:]]") + (rx space (regexp tramp-adb-ls-date-year-regexp) + space (regexp tramp-adb-ls-date-time-regexp) + space) "Regexp for date format in ls output.") (defconst tramp-adb-ls-toolbox-regexp - (concat - "^[[:space:]]*\\([-.[:alpha:]]+\\)" ; \1 permissions - "\\(?:[[:space:]]+[[:digit:]]+\\)?" ; links (Android 7/toybox) - "[[:space:]]*\\([^[:space:]]+\\)" ; \2 username - "[[:space:]]+\\([^[:space:]]+\\)" ; \3 group - "[[:space:]]+\\([[:digit:]]+\\)" ; \4 size - "[[:space:]]+\\(" tramp-adb-ls-date-year-regexp - "[[:space:]]" tramp-adb-ls-date-time-regexp "\\)" ; \5 date - "[[:space:]]\\(.*\\)$") ; \6 filename + (rx bol (* space) (group (+ (any ".-" alpha))) ; \1 permissions + (? (+ space) (+ digit)) ; links (Android 7/toybox) + (* space) (group (+ (not space))) ; \2 username + (+ space) (group (+ (not space))) ; \3 group + (+ space) (group (+ digit)) ; \4 size + (+ space) (group (regexp tramp-adb-ls-date-year-regexp) + space (regexp tramp-adb-ls-date-time-regexp)) ; \5 date + space (group (* nonl)) eol) ; \6 filename "Regexp for ls output.") ;;;###tramp-autoload @@ -220,7 +217,8 @@ arguments to pass to the OPERATION." (delq nil (mapcar (lambda (line) - (when (string-match "^\\(\\S-+\\)[[:space:]]+device$" line) + (when (string-match + (rx bol (group (+ (not space))) (+ space) "device" eol) line) ;; Replace ":" by "#". `(nil ,(tramp-compat-string-replace ":" tramp-prefix-port-format (match-string 1 line))))) @@ -237,10 +235,10 @@ arguments to pass to the OPERATION." (goto-char (point-min)) (forward-line) (when (looking-at - (concat "[[:space:]]*[^[:space:]]+" - "[[:space:]]+\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)")) + (rx (* space) (+ (not space)) + (+ space) (group (+ digit)) + (+ space) (group (+ digit)) + (+ space) (group (+ digit)))) ;; The values are given as 1k numbers, so we must change ;; them to number of bytes. (list (* 1024 (string-to-number (match-string 1))) @@ -280,10 +278,10 @@ arguments to pass to the OPERATION." (name (match-string 6)) (symlink-target (and is-symlink - (cadr (split-string name "\\( -> \\|\n\\)"))))) + (cadr (split-string name (rx (group (| " -> " "\n")))))))) (push (list (if is-symlink - (car (split-string name "\\( -> \\|\n\\)")) + (car (split-string name (rx (group (| " -> " "\n"))))) name) (or is-dir symlink-target) 1 ;link-count @@ -315,7 +313,7 @@ arguments to pass to the OPERATION." (tramp-shell-quote-argument localname))) ;; We insert also filename/. and filename/.., because "ls" ;; doesn't on some file systems, like "sdcard". - (unless (re-search-backward "\\.$" nil t) + (unless (re-search-backward (rx "." eol) nil t) (narrow-to-region (point-max) (point-max)) (tramp-adb-send-command v (format "%s -d -a -l %s %s | cat" @@ -325,9 +323,8 @@ arguments to pass to the OPERATION." (tramp-shell-quote-argument (tramp-compat-file-name-concat localname "..")))) (tramp-compat-replace-regexp-in-region - (regexp-quote - (tramp-compat-file-name-unquote - (file-name-as-directory localname))) + (rx (literal (tramp-compat-file-name-unquote + (file-name-as-directory localname)))) "" (point-min)) (widen))) (tramp-adb-sh-fix-ls-output) @@ -365,16 +362,12 @@ Emacs dired can't find files." (goto-char (point-min)) (while (search-forward-regexp - (eval-when-compile - (concat - "[[:space:]]" - "\\([[:space:]]" tramp-adb-ls-date-year-regexp "[[:space:]]\\)")) + (rx space (group space (regexp tramp-adb-ls-date-year-regexp) space)) nil t) (replace-match "0\\1" "\\1" nil) ;; Insert missing "/". (when (looking-at-p - (eval-when-compile - (concat tramp-adb-ls-date-time-regexp "[[:space:]]+$"))) + (rx (regexp tramp-adb-ls-date-time-regexp) (+ space) eol)) (end-of-line) (insert "/"))) ;; Sort entries. @@ -472,7 +465,8 @@ Emacs dired can't find files." (delq nil (mapcar - (lambda (l) (and (not (string-match-p "^[[:space:]]*$" l)) l)) + (lambda (l) + (and (not (string-match-p (rx bol (* space) eol) l)) l)) (split-string (buffer-string) "\n"))))))))))) (defun tramp-adb-handle-file-local-copy (filename) @@ -566,9 +560,10 @@ Emacs dired can't find files." ;; (introduced in POSIX.1-2008) fails. (tramp-adb-send-command-and-check v (format - (concat "touch -d %s %s %s 2>%s || " - "touch -d %s %s %s 2>%s || " - "touch -t %s %s %s") + (eval-when-compile + (concat "touch -d %s %s %s 2>%s || " + "touch -d %s %s %s 2>%s || " + "touch -t %s %s %s")) (format-time-string "%Y-%m-%dT%H:%M:%S.%NZ" time t) nofollow quoted-name (tramp-get-remote-null-device v) (format-time-string "%Y-%m-%dT%H:%M:%S" time t) @@ -723,10 +718,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (setcar result 0) (dolist (line signals) (when (string-match - (concat - "^[[:space:]]*\\([[:digit:]]+\\)" - "[[:space:]]+\\S-+[[:space:]]+" - "\\([[:alpha:]].*\\)$") + (rx bol (* space) (group (+ digit)) + (+ space) (+ (not space)) + (+ space) (group alpha (* nonl)) eol) line) (setcar (nthcdr (string-to-number (match-string 1 line)) result) @@ -924,7 +918,7 @@ implementation will be used." (i 0) p) - (when (string-match-p "[[:multibyte:]]" command) + (when (string-match-p (rx multibyte) command) (tramp-error v 'file-error "Cannot apply multi-byte command `%s'" command)) @@ -997,7 +991,7 @@ implementation will be used." (while (progn (goto-char (point-min)) - (not (re-search-forward "[\n]" nil t))) + (not (search-forward "\n" nil t))) (tramp-accept-process-output p 0)) (delete-region (point-min) (point))) ;; Provide error buffer. This shows only @@ -1125,7 +1119,7 @@ error and non-nil on success." (defun tramp-adb-send-command (vec command &optional neveropen nooutput) "Send the COMMAND to connection VEC." - (if (string-match-p "[[:multibyte:]]" command) + (if (string-match-p (rx multibyte) command) ;; Multibyte codepoints with four bytes are not supported at ;; least by toybox. @@ -1149,12 +1143,12 @@ error and non-nil on success." ;; We can't use stty to disable echo of command. stty is said ;; to be added to toybox 0.7.6. busybox shall have it, but this ;; isn't used any longer for Android. - (delete-matching-lines (regexp-quote command)) + (delete-matching-lines (rx (literal command))) ;; When the local machine is W32, there are still trailing ^M. ;; There must be a better solution by setting the correct coding ;; system, but this requires changes in core Tramp. (goto-char (point-min)) - (while (re-search-forward "\r+$" nil t) + (while (re-search-forward (rx (+ "\r") eol) nil t) (replace-match "" nil nil))))))) (defun tramp-adb-send-command-and-check (vec command &optional exit-status) @@ -1170,7 +1164,7 @@ the exit status." (format "%s; echo tramp_exit_status $?" command) "echo tramp_exit_status $?")) (with-current-buffer (tramp-get-connection-buffer vec) - (unless (tramp-search-regexp "tramp_exit_status [[:digit:]]+") + (unless (tramp-search-regexp (rx "tramp_exit_status " (+ digit))) (tramp-error vec 'file-error "Couldn't find exit status of `%s'" command)) (skip-chars-forward "^ ") @@ -1198,7 +1192,7 @@ FMT and ARGS are passed to `error'." (let ((inhibit-read-only t)) (goto-char (point-min)) ;; ADB terminal sends "^H" sequences. - (when (re-search-forward "<\b+" (line-end-position) t) + (when (re-search-forward (rx "<" (+ "\b")) (line-end-position) t) (forward-line 1) (delete-region (point-min) (point))) ;; Delete the prompt. @@ -1232,7 +1226,7 @@ connection if a previous connection has died for some reason." ;; Maybe we know already that "su" is not supported. We cannot ;; use a connection property, because we have not checked yet ;; whether it is still the same device. - (when (and user (not (tramp-get-file-property vec "" "su-command-p" t))) + (when (and user (not (tramp-get-file-property vec "/" "su-command-p" t))) (tramp-error vec 'file-error "Cannot switch to user `%s'" user)) (unless (process-live-p p) @@ -1272,7 +1266,7 @@ connection if a previous connection has died for some reason." ;; Change prompt. (tramp-set-connection-property - p "prompt" (regexp-quote (format "///%s#$" prompt))) + p "prompt" (rx "///" (literal prompt) "#$")) (tramp-adb-send-command vec (format "PS1=\"///\"\"%s\"\"#$\"" prompt)) @@ -1290,10 +1284,11 @@ connection if a previous connection has died for some reason." (tramp-message vec 5 "Checking system information") (tramp-adb-send-command vec - (concat - "echo \\\"`getprop ro.product.model` " - "`getprop ro.product.version` " - "`getprop ro.build.version.release`\\\"")) + (eval-when-compile + (concat + "echo \\\"`getprop ro.product.model` " + "`getprop ro.product.version` " + "`getprop ro.build.version.release`\\\""))) (let ((old-getprop (tramp-get-connection-property vec "getprop")) (new-getprop (tramp-set-connection-property @@ -1317,7 +1312,7 @@ connection if a previous connection has died for some reason." (unless (tramp-adb-send-command-and-check vec nil) (delete-process p) ;; Do not flush, we need the nil value. - (tramp-set-file-property vec "" "su-command-p" nil) + (tramp-set-file-property vec "/" "su-command-p" nil) (tramp-error vec 'file-error "Cannot switch to user `%s'" user))) |