treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checked

gitster · gitster · commit c7054209d65d · 2017-05-30T09:29:00.000+09:00
Using the is_missing_file_error() helper introduced in the previous
step, update all hits from

  $ git grep -e ENOENT --and -e ENOTDIR

There are codepaths that only check ENOENT, and it is possible that
some of them should be checking both.  Updating them is kept out of
this step deliberately, as we do not want to change behaviour in this
step.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/apply.c b/apply.c
@@ -3741,7 +3741,7 @@ static int check_to_create(struct apply_state *state,
 			return 0;
 
 		return EXISTS_IN_WORKTREE;
-	} else if ((errno != ENOENT) && (errno != ENOTDIR)) {
+	} else if (!is_missing_file_error(errno)) {
 		return error_errno("%s", new_name);
 	}
 	return 0;
diff --git a/builtin/rm.c b/builtin/rm.c
@@ -129,7 +129,7 @@ static int check_local_mod(struct object_id *head, int index_only)
 		ce = active_cache[pos];
 
 		if (lstat(ce->name, &st) < 0) {
-			if (errno != ENOENT && errno != ENOTDIR)
+			if (!is_missing_file_error(errno))
 				warning_errno(_("failed to stat '%s'"), ce->name);
 			/* It already vanished from the working tree */
 			continue;
diff --git a/builtin/update-index.c b/builtin/update-index.c
@@ -253,7 +253,7 @@ static int remove_one_path(const char *path)
  */
 static int process_lstat_error(const char *path, int err)
 {
-	if (err == ENOENT || err == ENOTDIR)
+	if (is_missing_file_error(err))
 		return remove_one_path(path);
 	return error("lstat(\"%s\"): %s", path, strerror(err));
 }
diff --git a/diff-lib.c b/diff-lib.c
@@ -29,7 +29,7 @@
 static int check_removed(const struct cache_entry *ce, struct stat *st)
 {
 	if (lstat(ce->name, st) < 0) {
-		if (errno != ENOENT && errno != ENOTDIR)
+		if (!is_missing_file_error(errno))
 			return -1;
 		return 1;
 	}
diff --git a/dir.c b/dir.c
@@ -2235,7 +2235,7 @@ int remove_path(const char *name)
 {
 	char *slash;
 
-	if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
+	if (unlink(name) && !is_missing_file_error(errno))
 		return -1;
 
 	slash = strrchr(name, '/');
diff --git a/setup.c b/setup.c
@@ -147,7 +147,7 @@ int check_filename(const char *prefix, const char *arg)
 		name = arg;
 	if (!lstat(name, &st))
 		return 1; /* file exists */
-	if (errno == ENOENT || errno == ENOTDIR)
+	if (is_missing_file_error(errno))
 		return 0; /* file does not exist */
 	die_errno("failed to stat '%s'", arg);
 }
diff --git a/sha1_name.c b/sha1_name.c
@@ -1406,7 +1406,7 @@ static void diagnose_invalid_sha1_path(const char *prefix,
 	if (file_exists(filename))
 		die("Path '%s' exists on disk, but not in '%.*s'.",
 		    filename, object_name_len, object_name);
-	if (errno == ENOENT || errno == ENOTDIR) {
+	if (is_missing_file_error(errno)) {
 		char *fullname = xstrfmt("%s%s", prefix, filename);
 
 		if (!get_tree_entry(tree_sha1, fullname,
@@ -1471,7 +1471,7 @@ static void diagnose_invalid_index_path(int stage,
 
 	if (file_exists(filename))
 		die("Path '%s' exists on disk, but not in the index.", filename);
-	if (errno == ENOENT || errno == ENOTDIR)
+	if (is_missing_file_error(errno))
 		die("Path '%s' does not exist (neither on disk nor in the index).",
 		    filename);
 
diff --git a/wrapper.c b/wrapper.c
@@ -583,8 +583,8 @@ void warn_on_inaccessible(const char *path)
 
 static int access_error_is_ok(int err, unsigned flag)
 {
-	return err == ENOENT || err == ENOTDIR ||
-		((flag & ACCESS_EACCES_OK) && err == EACCES);
+	return (is_missing_file_error(err) ||
+		((flag & ACCESS_EACCES_OK) && err == EACCES));
 }
 
 int access_or_warn(const char *path, int mode, unsigned flag)

Original file line number	Diff line number	Diff line change
`@@ -3741,7 +3741,7 @@ static int check_to_create(struct apply_state *state,`
`3741`	`3741`	`return 0;`
`3742`	`3742`
`3743`	`3743`	`return EXISTS_IN_WORKTREE;`
`3744`		`- } else if ((errno != ENOENT) && (errno != ENOTDIR)) {`
	`3744`	`+ } else if (!is_missing_file_error(errno)) {`
`3745`	`3745`	`return error_errno("%s", new_name);`
`3746`	`3746`	`}`
`3747`	`3747`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ static int remove_one_path(const char *path)`
`253`	`253`	`*/`
`254`	`254`	`static int process_lstat_error(const char *path, int err)`
`255`	`255`	`{`
`256`		`- if (err == ENOENT \|\| err == ENOTDIR)`
	`256`	`+ if (is_missing_file_error(err))`
`257`	`257`	`return remove_one_path(path);`
`258`	`258`	`return error("lstat(\"%s\"): %s", path, strerror(err));`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`static int check_removed(const struct cache_entry ce, struct stat st)`
`30`	`30`	`{`
`31`	`31`	`if (lstat(ce->name, st) < 0) {`
`32`		`- if (errno != ENOENT && errno != ENOTDIR)`
	`32`	`+ if (!is_missing_file_error(errno))`
`33`	`33`	`return -1;`
`34`	`34`	`return 1;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2235,7 +2235,7 @@ int remove_path(const char *name)`
`2235`	`2235`	`{`
`2236`	`2236`	`char *slash;`
`2237`	`2237`
`2238`		`- if (unlink(name) && errno != ENOENT && errno != ENOTDIR)`
	`2238`	`+ if (unlink(name) && !is_missing_file_error(errno))`
`2239`	`2239`	`return -1;`
`2240`	`2240`
`2241`	`2241`	`slash = strrchr(name, '/');`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ int check_filename(const char prefix, const char arg)`
`147`	`147`	`name = arg;`
`148`	`148`	`if (!lstat(name, &st))`
`149`	`149`	`return 1; /* file exists */`
`150`		`- if (errno == ENOENT \|\| errno == ENOTDIR)`
	`150`	`+ if (is_missing_file_error(errno))`
`151`	`151`	`return 0; /* file does not exist */`
`152`	`152`	`die_errno("failed to stat '%s'", arg);`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -583,8 +583,8 @@ void warn_on_inaccessible(const char *path)`
`583`	`583`
`584`	`584`	`static int access_error_is_ok(int err, unsigned flag)`
`585`	`585`	`{`
`586`		`- return err == ENOENT \|\| err == ENOTDIR \|\|`
`587`		`- ((flag & ACCESS_EACCES_OK) && err == EACCES);`
	`586`	`+ return (is_missing_file_error(err) \|\|`
	`587`	`+ ((flag & ACCESS_EACCES_OK) && err == EACCES));`
`588`	`588`	`}`
`589`	`589`
`590`	`590`	`int access_or_warn(const char *path, int mode, unsigned flag)`