November 2015 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Document pacman -F
by Florian Pritz 02 Nov '15

02 Nov '15

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- doc/pacman.8.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 5c57450..a4dd1f0 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -110,6 +110,11 @@ greater than `1:3.6-1`. Options>> below; also see <<HCF,Handling Config Files>> for an explanation on how pacman takes care of configuration files. +*-F, \--files*:: + Query the files database. This operation allows you to look for package + owning certain files or display files owned by certain packages. See + <<FO,File Options>> below. + *-V, \--version*:: Display version and exit. @@ -451,6 +456,23 @@ Database Options[[QO]] a check on the sync databases to ensure all specified dependencies are available. +File Options[[FO]] +------------------ + +The '--list', '--search' and '--owns' options are exclusive and can not be combined. + +*-l <package>, \--list <package>*:: + List the files owned by the queried package. + +*-s <pattern>, \--search <pattern>*:: + Search package file names for matching strings. + +*-x, --regex*:: + Treat arguments to '--search' as regular expressions. + +*-o <file>, \--owns<file>*:: + Search for packages that own a particular file. + Handling Config Files[[HCF]] ---------------------------- -- 2.6.2

5 19

[pacman-dev] [PATCH v2] package.c: Fix incorrect buffersize and constant-folding
by Pierre Neidhardt 02 Nov '15

02 Nov '15

Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/pacman/package.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index dbd23f5..c9301ac 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -90,9 +90,8 @@ static void make_aligned_titles(void) { unsigned int i; size_t max = 0; - static const wchar_t *title_suffix = L" :"; - static const size_t title_suffix_len = sizeof(title_suffix); - wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + title_suffix_len]; + static const wchar_t title_suffix[] = L" :"; + wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + ARRAYSIZE(title_suffix)]; size_t wlen[ARRAYSIZE(wbuf)]; char *buf[ARRAYSIZE(wbuf)]; buf[T_ARCHITECTURE] = _("Architecture"); @@ -133,7 +132,7 @@ static void make_aligned_titles(void) for(i = 0; i < ARRAYSIZE(wbuf); i++) { wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]); - wmemcpy(wbuf[i] + max, title_suffix, title_suffix_len); + wmemcpy(wbuf[i] + max, title_suffix, ARRAYSIZE(title_suffix)); wcstombs(titles[i], wbuf[i], sizeof(wbuf[i])); } } -- 2.6.2

1 0

[pacman-dev] [PATCH] package.c, fix incorrect buffersize
by Rikard Falkeborn 02 Nov '15

02 Nov '15

Correct title_suffix_len to be the actual number of elements in the string (including the NUL-terminator) instead of the size of a pointer. Note that wmemcpy blindly copies the number of wide characters it is told to copy (no check for NUL-terminating character), so this previously copied data outside of title_suffix. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- src/pacman/package.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index dbd23f5..59f4327 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -79,6 +79,8 @@ enum { * potential growth. */ #define TITLE_MAXLEN 50 +#define TITLE_SUFFIX L" :" +#define TITLE_SUFFIX_LEN (ARRAYSIZE(TITLE_SUFFIX)) static char titles[_T_MAX][TITLE_MAXLEN * sizeof(wchar_t)]; @@ -90,9 +92,7 @@ static void make_aligned_titles(void) { unsigned int i; size_t max = 0; - static const wchar_t *title_suffix = L" :"; - static const size_t title_suffix_len = sizeof(title_suffix); - wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + title_suffix_len]; + wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + TITLE_SUFFIX_LEN]; size_t wlen[ARRAYSIZE(wbuf)]; char *buf[ARRAYSIZE(wbuf)]; buf[T_ARCHITECTURE] = _("Architecture"); @@ -133,7 +133,7 @@ static void make_aligned_titles(void) for(i = 0; i < ARRAYSIZE(wbuf); i++) { wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]); - wmemcpy(wbuf[i] + max, title_suffix, title_suffix_len); + wmemcpy(wbuf[i] + max, TITLE_SUFFIX, TITLE_SUFFIX_LEN); wcstombs(titles[i], wbuf[i], sizeof(wbuf[i])); } } -- 2.6.2

4 17

[pacman-dev] [PATCH] add detail to broken dependency errors
by Andrew Gregory 02 Nov '15

02 Nov '15

The difference between a sync target having an unmet dependency and breaking a dependency for an installed package is a common source of confusion. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/remove.c | 3 ++- src/pacman/sync.c | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 069f236..e41e7f5 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -122,7 +122,8 @@ int pacman_remove(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); - colon_printf(_("%s: requires %s\n"), miss->target, depstring); + colon_printf(_("%s: removing %s breaks dependency '%s'\n"), + miss->target, miss->causingpkg, depstring); free(depstring); alpm_depmissing_free(miss); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 2a0f4b5..b13f76a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -707,6 +707,26 @@ static int sync_trans(alpm_list_t *targets) return sync_prepare_execute(); } +static void print_broken_dep(alpm_depmissing_t *miss) +{ + char *depstring = alpm_dep_compute_string(miss->depend); + alpm_list_t *trans_add = alpm_trans_get_add(config->handle); + alpm_pkg_t *pkg; + if(miss->causingpkg == NULL) { + /* package being installed/upgraded has unresolved dependency */ + colon_printf(_("%s: requires %s\n"), miss->target, depstring); + } else if((pkg = alpm_pkg_find(trans_add, miss->causingpkg))) { + /* upgrading a package breaks a local dependency */ + colon_printf(_("%s: installing %s (%s) breaks dependency '%s'\n"), + miss->target, miss->causingpkg, alpm_pkg_get_version(pkg), depstring); + } else { + /* removing a package breaks a local dependency */ + colon_printf(_("%s: removing %s breaks dependency '%s'\n"), + miss->target, miss->causingpkg, depstring); + } + free(depstring); +} + int sync_prepare_execute(void) { alpm_list_t *i, *packages, *data = NULL; @@ -727,11 +747,8 @@ int sync_prepare_execute(void) break; case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { - alpm_depmissing_t *miss = i->data; - char *depstring = alpm_dep_compute_string(miss->depend); - colon_printf(_("%s: requires %s\n"), miss->target, depstring); - free(depstring); - alpm_depmissing_free(miss); + print_broken_dep(i->data); + alpm_depmissing_free(i->data); } break; case ALPM_ERR_CONFLICTING_DEPS: -- 2.6.2

1 0

[pacman-dev] [PATCH] add --quiet to -Fh
by Andrew Gregory 02 Nov '15

02 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 019b0c2..e3d4621 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -177,6 +177,7 @@ static void usage(int op, const char * const myname) } else if(op == PM_OP_FILES) { addlist(_(" -l, --list list the files owned by the queried package\n")); addlist(_(" -o, --owns <file> query the package that owns <file>\n")); + addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -s, --search <file> search package file names for matching strings\n")); addlist(_(" -x, --regex enable searching using regular expressions\n")); addlist(_(" -y, --refresh download fresh package databases from the server\n" -- 2.6.2

1 0

[pacman-dev] [PATCH] files_search: reset found for each target
by Andrew Gregory 02 Nov '15

02 Nov '15

Otherwise any invalid targets following a successful match will not get an error message. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index c2231cd..3dc915a 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -178,10 +178,11 @@ static void dump_file_list(alpm_pkg_t *pkg) { static int files_list(alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j; - int ret = 0, found = 0; + int ret = 0; if(targets != NULL) { for(i = targets; i; i = alpm_list_next(i)) { + int found = 0; char *targ = i->data; char *repo = NULL; char *c = strchr(targ, '/'); -- 2.6.2

1 0

[pacman-dev] [PATCH] files_search: free compiled regex
by Andrew Gregory 02 Nov '15

02 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/files.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/files.c b/src/pacman/files.c index ef48f96..c2231cd 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -141,6 +141,9 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { } } + if(regex) { + regfree(&reg); + } notfound: if(!found) { -- 2.6.2

1 0

[pacman-dev] [PATCH] files: do not unnecessarily strdup targets
by Andrew Gregory 02 Nov '15

02 Nov '15

Targets are never modified so we can just use the original copy. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/files.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 9536005..ef48f96 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -33,19 +33,13 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *t; for(t = targets; t; t = alpm_list_next(t)) { - char *filename = NULL, *f; + char *filename = t->data; int found = 0; alpm_list_t *s; - size_t len; + size_t len = strlen(filename); - if((filename = strdup(t->data)) == NULL) { - goto notfound; - } - - len = strlen(filename); - f = filename; - while(len > 1 && f[0] == '/') { - f = f + 1; + while(len > 1 && filename[0] == '/') { + filename++; len--; } @@ -58,10 +52,10 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { alpm_pkg_t *pkg = p->data; alpm_filelist_t *files = alpm_pkg_get_files(pkg); - if(alpm_filelist_contains(files, f)) { + if(alpm_filelist_contains(files, filename)) { if(!config->quiet) { - printf(_("%s is owned by %s/%s %s\n"), f, + printf(_("%s is owned by %s/%s %s\n"), filename, alpm_db_get_name(repo), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { @@ -73,9 +67,6 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { } } - free(filename); - -notfound: if(!found) { ret++; } @@ -90,19 +81,14 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { const colstr_t *colstr = &config->colstr; for(t = targets; t; t = alpm_list_next(t)) { - char *targ = NULL; + char *targ = t->data; alpm_list_t *s; int found = 0; regex_t reg; - if((targ = strdup(t->data)) == NULL) { - goto notfound; - } - if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { /* TODO: error message */ - free(targ); goto notfound; } } @@ -129,7 +115,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { m = strcmp(c + 1, targ); } if(m == 0) { - match = alpm_list_add(match, strdup(files->files[f].name)); + match = alpm_list_add(match, files->files[f].name); found = 1; } } @@ -149,13 +135,12 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { c = ml->data; printf(" %s\n", c); } - FREELIST(match); } + alpm_list_free(match); } } } - free(targ); notfound: if(!found) { -- 2.6.2

1 0

[pacman-dev] [PATCH] files.c: add vim modeline
by Andrew Gregory 02 Nov '15

02 Nov '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 31ce9e0..9536005 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -289,6 +289,7 @@ int pacman_files(alpm_list_t *targets) return files_list(files_dbs, targets); } - return 0; } + +/* vim: set noet: */ -- 2.6.2

1 0