Commit fee762d6 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: refactor conf_touch_dep() 



If this function fails to touch a dummy header due to missing parent
directory, then it creates it and touches the file again.

This was needed because CONFIG_FOO_BAR was previously tracked by
include/config/foo/bar.h. (include/config/foo/ may not exist here)

This is no longer the case since commit 0e0345b7 ("kbuild: redo
fake deps at include/config/*.h"); now all the fake headers are placed
right under include/config/, like include/config/FOO_BAR.

Do not try to create parent directory, include/config/, which already
exists.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 00d674cb

scripts/kconfig/confdata.c

+4 −18
Original line number Diff line number Diff line
@@ -130,31 +130,17 @@ static size_t depfile_prefix_len; 
/* touch depfile for symbol 'name' */

static int conf_touch_dep(const char *name)

{

	int fd, ret;

	char *d;

	int fd;



	/* check overflow: prefix + name + '\0' must fit in buffer. */

	if (depfile_prefix_len + strlen(name) + 1 > sizeof(depfile_path))

		return -1;



	d = depfile_path + depfile_prefix_len;

	strcpy(d, name);

	strcpy(depfile_path + depfile_prefix_len, name);



	/* Assume directory path already exists. */

	fd = open(depfile_path, O_WRONLY | O_CREAT | O_TRUNC, 0644);

	if (fd == -1) {

		if (errno != ENOENT)

			return -1;



		ret = make_parent_dir(depfile_path);

		if (ret)

			return ret;



		/* Try it again. */

	fd = open(depfile_path, O_WRONLY | O_CREAT | O_TRUNC, 0644);

	if (fd == -1)

		return -1;

	}

	close(fd);



	return 0;