Re: [PATCH] Fix merge-recursive on cygwin: broken errno when unlinking a directory

From: Sam Ravnborg <sam@ravnborg.org>
Date: Apr 19, 2007, 18:31 UTC
Message-ID: <20070419183106.GB3396@uranus.ravnborg.org>
In-Reply-To: <alpine.LFD.0.98.0704190932450.9964@woody.linux-foundation.org>

> +		if (status == -3) {
> +			/* something else exists */
> +			error(msg, path, ": perhaps a D/F conflict?");

It would be more helpful it you spelled it out like: Directory/File conflict?

Show 13 quoted lines

> +			return -1;
> +		}
> +		die(msg, path, "");
> +	}
> +
> +	/* Successful unlink is good.. */
> +	if (!unlink(path))
> +		return 0;
> +	/* .. and so is no existing file */
> +	if (errno == ENOENT)
> +		return 0;
> +	/* .. but not some other error (who really cares what?) */
> +	return error(msg, path, ": perhaps a D/F conflict?");

ditto.

I know this was how it looked previously too but thats just a lame excuse.

Sam