From e3c6d04d273550b8a67afd3d8d6d6e1c6fe9edfa Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 22 Oct 2017 09:05:16 -0400 Subject: --build fixes --- src/fbuilder/build_bin.c | 3 ++- src/fbuilder/build_fs.c | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c index 31b6ba8e8..6c173bfcc 100644 --- a/src/fbuilder/build_bin.c +++ b/src/fbuilder/build_bin.c @@ -114,12 +114,13 @@ void build_bin(const char *fname) { } if (bin_out) { - printf("# private-bin "); + printf("private-bin "); FileDB *ptr = bin_out; while (ptr) { printf("%s,", ptr->fname); ptr = ptr->next; } printf("\n"); + printf("# private-lib\n"); } } diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c index 5e63c241a..01104edb1 100644 --- a/src/fbuilder/build_fs.c +++ b/src/fbuilder/build_fs.c @@ -178,16 +178,22 @@ void build_var(const char *fname) { static FileDB *share_out = NULL; static void share_callback(char *ptr) { // extract the directory: - // "/usr/share/bash-completion/bash_completion" becomes "/usr/share/bash-completion" assert(strncmp(ptr, "/usr/share", 10) == 0); char *p1 = ptr + 10; if (*p1 != '/') return; p1++; + if (*p1 == '/') // double '/' + p1++; + if (*p1 == '\0') + return; + + // "/usr/share/bash-completion/bash_completion" becomes "/usr/share/bash-completion" char *p2 = strchr(p1, '/'); if (p2) *p2 = '\0'; + // store the file share_out = filedb_add(share_out, ptr); } -- cgit v1.2.3-54-g00ecf