Commit 23a2aa5b authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

pass (potentially URL-encoded) file:// URLs to curl 

This means it will be treated like an HTTP image (no write operations,
copying to /tmp etc), but it's still better than no file:// support.

Also, this is why it's not documented yet.
parent 865a7851

src/filelist.c

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ void add_file_to_filelist_recursively(char *origpath, unsigned char level) 


		if ((!strncmp(path, "http://", 7))

				|| (!strncmp(path, "https://", 8))

				|| (!strncmp(path, "ftp://", 6))) {

				|| (!strncmp(path, "ftp://", 6))

				|| (!strncmp(path, "file://", 7))) {

			/* Its a url */

			D(("Adding url %s to filelist\n", path));

			filelist = gib_list_add_front(filelist, feh_file_new(path));

src/imlib.c

+4 −2
Original line number Diff line number Diff line
@@ -243,8 +243,10 @@ int feh_load_image(Imlib_Image * im, feh_file * file) 
		return 0;



	/* Handle URLs */

	if ((!strncmp(file->filename, "http://", 7)) || (!strncmp(file->filename, "https://", 8))

			|| (!strncmp(file->filename, "ftp://", 6))) {

	if ((!strncmp(file->filename, "http://", 7))

			|| (!strncmp(file->filename, "https://", 8))

			|| (!strncmp(file->filename, "ftp://", 6))

			|| (!strncmp(file->filename, "file://", 7))) {

		image_source = SRC_HTTP;



		if ((tmpname = feh_http_load_image(file->filename)) == NULL)