Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8329e35 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

fixdep: accept extra dependencies on stdin 



... and merge them in the list of parsed dependencies.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
parent f2355416

scripts/basic/fixdep.c

+45 −15
Original line number Original line Diff line number Diff line
@@ -120,13 +120,15 @@ 
#define INT_NFIG ntohl(0x4e464947)

#define INT_NFIG ntohl(0x4e464947)

#define INT_FIG_ ntohl(0x4649475f)

#define INT_FIG_ ntohl(0x4649475f)





int insert_extra_deps;

char *target;

char *target;

char *depfile;

char *depfile;

char *cmdline;

char *cmdline;





static void usage(void)

static void usage(void)

{

{

	fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");

	fprintf(stderr, "Usage: fixdep [-e] <depfile> <target> <cmdline>\n");

	fprintf(stderr, " -e  insert extra dependencies given on stdin\n");

	exit(1);

	exit(1);

}

}
@@ -138,6 +140,40 @@ static void print_cmdline(void) 
	printf("cmd_%s := %s\n\n", target, cmdline);

	printf("cmd_%s := %s\n\n", target, cmdline);

}

}





/*

 * Print out a dependency path from a symbol name

 */

static void print_config(const char *m, int slen)

{

	int c, i;



	printf("    $(wildcard include/config/");

	for (i = 0; i < slen; i++) {

		c = m[i];

		if (c == '_')

			c = '/';

		else

			c = tolower(c);

		putchar(c);

	}

	printf(".h) \\\n");

}



static void do_extra_deps(void)

{

	if (insert_extra_deps) {

		char buf[80];

		while(fgets(buf, sizeof(buf), stdin)) {

			int len = strlen(buf);

			if (len < 2 || buf[len-1] != '\n') {

				fprintf(stderr, "fixdep: bad data on stdin\n");

				exit(1);

			}

			print_config(buf, len-1);

		}

	}

}



struct item {

struct item {

	struct item	*next;

	struct item	*next;

	unsigned int	len;

	unsigned int	len;
@@ -197,23 +233,12 @@ static void define_config(const char *name, int len, unsigned int hash) 
static void use_config(const char *m, int slen)

static void use_config(const char *m, int slen)

{

{

	unsigned int hash = strhash(m, slen);

	unsigned int hash = strhash(m, slen);

	int c, i;





	if (is_defined_config(m, slen, hash))

	if (is_defined_config(m, slen, hash))

	    return;

	    return;





	define_config(m, slen, hash);

	define_config(m, slen, hash);



	print_config(m, slen);

	printf("    $(wildcard include/config/");

	for (i = 0; i < slen; i++) {

		c = m[i];

		if (c == '_')

			c = '/';

		else

			c = tolower(c);

		putchar(c);

	}

	printf(".h) \\\n");

}

}





static void parse_config_file(const char *map, size_t len)

static void parse_config_file(const char *map, size_t len)
@@ -250,7 +275,7 @@ static void parse_config_file(const char *map, size_t len) 
	}

	}

}

}





/* test is s ends in sub */

/* test if s ends in sub */

static int strrcmp(const char *s, const char *sub)

static int strrcmp(const char *s, const char *sub)

{

{

	int slen = strlen(s);

	int slen = strlen(s);
@@ -378,6 +403,8 @@ static void parse_dep_file(void *map, size_t len) 
		exit(1);

		exit(1);

	}

	}





	do_extra_deps();



	printf("\n%s: $(deps_%s)\n\n", target, target);

	printf("\n%s: $(deps_%s)\n\n", target, target);

	printf("$(deps_%s):\n", target);

	printf("$(deps_%s):\n", target);

}

}
@@ -434,7 +461,10 @@ int main(int argc, char *argv[]) 
{

{

	traps();

	traps();





	if (argc != 4)

	if (argc == 5 && !strcmp(argv[1], "-e")) {

		insert_extra_deps = 1;

		argv++;

	} else if (argc != 4)

		usage();

		usage();





	depfile = argv[1];

	depfile = argv[1];