Parcourir la source

Pass given file names to key-handler instead of real paths

Misbehaving command lines in the key-handler that rewrite the given files and
thus replace symbolic links instead of their targets shall call realpath(1).

Fixes issue #205 and reverts commit 92e3b578.
master
Bert Münnich il y a 7 ans
Parent
révision
5c607ad495
3 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. +1
    -1
      Makefile
  2. +1
    -1
      exec/key-handler
  3. +1
    -1
      main.c

+ 1
- 1
Makefile Voir le fichier

@@ -1,4 +1,4 @@
VERSION := git-20161228
VERSION := git-20170107

PREFIX := /usr/local
MANPREFIX := $(PREFIX)/share/man


+ 1
- 1
exec/key-handler Voir le fichier

@@ -18,7 +18,7 @@ readonly TMPFILE="/tmp/sxiv.$$"

rotate() {
degree="$1"
while read file; do
tr '\n' \0' | xargs -0 realpath | sort | uniq | while read file; do
case "$(file -b -i "$file")" in
image/jpeg*) jpegtran -rotate "$degree" -copy all -outfile "$file" "$file" ;;
*) mogrify -rotate "$degree" "$file" ;;


+ 1
- 1
main.c Voir le fichier

@@ -525,7 +525,7 @@ void run_key_handler(const char *key, unsigned int mask)
for (f = i = 0; f < fcnt; i++) {
if ((marked && (files[i].flags & FF_MARK)) || (!marked && i == fileidx)) {
stat(files[i].path, &oldst[f]);
fprintf(pfs, "%s\n", files[i].path);
fprintf(pfs, "%s\n", files[i].name);
f++;
}
}


Chargement…
Annuler
Enregistrer