sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use real path of all files internally, requires _XOPEN_SOURCE>=500, fixes issue #137

This commit is contained in:
Bert Münnich 2014-03-17 20:01:53 +01:00
parent 653a6ee83b
commit 6d7acac3d1
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,12 +1,13 @@
VERSION = git-20140218 VERSION = git-20140317
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man
CC = gcc CC = gcc
CFLAGS = -std=c99 -Wall -pedantic -O2 -I$(PREFIX)/include -DHAVE_GIFLIB CFLAGS = -std=c99 -Wall -pedantic -O2
LDFLAGS = -L$(PREFIX)/lib CPPFLAGS = -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_GIFLIB
LIBS = -lX11 -lImlib2 -lgif LDFLAGS = -L$(PREFIX)/lib
LIBS = -lX11 -lImlib2 -lgif
SRC = commands.c exif.c image.c main.c options.c thumbs.c util.c window.c SRC = commands.c exif.c image.c main.c options.c thumbs.c util.c window.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)
@ -16,7 +17,7 @@ all: sxiv
$(OBJ): Makefile config.h $(OBJ): Makefile config.h
.c.o: .c.o:
$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $< $(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
config.h: config.h:
cp config.def.h $@ cp config.def.h $@

18
main.c
View File

@ -127,16 +127,28 @@ void check_add_file(char *filename)
filecnt *= 2; filecnt *= 2;
files = (fileinfo_t*) s_realloc(files, filecnt * sizeof(fileinfo_t)); files = (fileinfo_t*) s_realloc(files, filecnt * sizeof(fileinfo_t));
} }
#if defined _BSD_SOURCE || defined _XOPEN_SOURCE && \
((_XOPEN_SOURCE - 0) >= 500 || defined _XOPEN_SOURCE_EXTENDED)
if ((files[fileidx].path = realpath(filename, NULL)) == NULL) {
warn("could not get real path of file: %s\n", filename);
return;
}
#else
if (*filename != '/') { if (*filename != '/') {
files[fileidx].path = absolute_path(filename); if ((files[fileidx].path = absolute_path(filename)) == NULL) {
if (files[fileidx].path == NULL) {
warn("could not get absolute path of file: %s\n", filename); warn("could not get absolute path of file: %s\n", filename);
return; return;
} }
} else {
files[fileidx].path = NULL;
} }
#endif
files[fileidx].loaded = false; files[fileidx].loaded = false;
files[fileidx].name = s_strdup(filename); files[fileidx].name = s_strdup(filename);
if (*filename == '/') if (files[fileidx].path == NULL)
files[fileidx].path = files[fileidx].name; files[fileidx].path = files[fileidx].name;
if ((bn = strrchr(files[fileidx].name , '/')) != NULL && bn[1] != '\0') if ((bn = strrchr(files[fileidx].name , '/')) != NULL && bn[1] != '\0')
files[fileidx].base = ++bn; files[fileidx].base = ++bn;