1.1 --- a/librazor/uri-io.c	Thu Jul 07 15:18:02 2016 +0100
     1.2 +++ b/librazor/uri-io.c	Fri Jul 08 15:54:09 2016 +0100
     1.3 @@ -161,7 +161,11 @@
     1.4  			free(path);
     1.5  			close(fd);
     1.6  			return addr;
     1.7 +#ifdef MSWIN_API
     1.8 +		} else if (errno != ENOTDIR && errno != ENOENT) {
     1.9 +#else
    1.10  		} else if (errno != ENOTDIR) {
    1.11 +#endif
    1.12  			free(path);
    1.13  			razor_set_error_posix(error, filename);
    1.14  			return NULL;
    1.15 @@ -171,10 +175,14 @@
    1.16  		slash = s;
    1.17  	}
    1.18  
    1.19 -	/* Impossible */
    1.20  	free(path);
    1.21 +#ifdef MSWIN_API
    1.22 +	razor_set_error(error, RAZOR_POSIX_ERROR, ENOENT, filename,
    1.23 +			strerror(ENOENT));
    1.24 +#else
    1.25  	razor_set_error(error, RAZOR_POSIX_ERROR, ENOTDIR, filename,
    1.26  			strerror(ENOTDIR));
    1.27 +#endif
    1.28  	return NULL;
    1.29  }
    1.30  #endif
    1.31 @@ -203,7 +211,11 @@
    1.32  	fd = open(filename, O_RDONLY | O_BINARY);
    1.33  	if (fd < 0) {
    1.34  #if HAVE_LIBARCHIVE
    1.35 +#ifdef MSWIN_API
    1.36 +		if (errno != ENOTDIR && errno != ENOENT) {
    1.37 +#else
    1.38  		if (errno != ENOTDIR) {
    1.39 +#endif
    1.40  			razor_set_error_posix(error, filename);
    1.41  			return NULL;
    1.42  		}