- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] [PATCH v2] Dull version colour numbers in summary
by Carson Black 17 Mar '20

17 Mar '20

As mentioned on IRC, formatting was mangled. Fixed formatting issues.

2 2

[pacman-dev] [PATCH] Implement _alpm_multi_download
by Anatol Pomozov 17 Mar '20

17 Mar '20

It is equivalent of _alpm_download but accepts list of payloads. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/dload.c | 50 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7cd3e3a4..bec3ff5e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -604,6 +604,16 @@ cleanup: return ret; } + +static int curl_multi_download_internal(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath) +{ + (void)handle; + (void)payloads; + (void)localpath; + return 0; +} #endif /** Download a file given by a URL to a local directory. @@ -640,10 +650,42 @@ int _alpm_multi_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, const char *localpath) { - (void)handle; - (void)payloads; - (void)localpath; - return 0; + if(handle->fetchcb == NULL) { +#ifdef HAVE_LIBCURL + return curl_multi_download_internal(handle, payloads, localpath); +#else + RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); +#endif + } else { + alpm_list_t *p; + for(p = payloads; p; p = p->next) { + struct dload_payload *payload = p->data; + alpm_list_t *s; + int success = 0; + + for(s = payload->servers; s; s = s->next) { + const char *server = s->data; + char *fileurl; + int ret; + + size_t len = strlen(server) + strlen(payload->filepath) + 2; + MALLOC(fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(fileurl, len, "%s/%s", server, payload->filepath); + + ret = handle->fetchcb(fileurl, localpath, payload->force); + free(fileurl); + + if (ret != -1) { + success = 1; + break; + } + } + if(!success && !payload->errors_ok) { + RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); + } + } + return 0; + } } static char *filecache_find_url(alpm_handle_t *handle, const char *url) -- 2.25.1

2 3

[pacman-dev] [PATCH] Dull version colour numbers in summary
by Carson Black 15 Mar '20

15 Mar '20

Version colour numbers are dulled in the non-verbose transaction summary when colours are enabled. To prevent a regression, this patch also adds handling of strings with ANSI codes to string_length as to not break the transaction summary's output functions when colour codes are in the package name strings. Signed-off-by: Carson Black <uhhadd(a)gmail.com> --- src/pacman/conf.c | 40 +++++++++++++++------------- src/pacman/conf.h | 1 + src/pacman/util.c | 68 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 71 insertions(+), 38 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9de386f..142dffcb 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -63,30 +63,34 @@ config_t *config = NULL; #define BOLDCYAN "\033[1;36m" #define BOLDWHITE "\033[1;37m" +#define FAINTBLACK "\033[0;90m" + void enable_colors(int colors) { colstr_t *colstr = &config->colstr; if(colors == PM_COLOR_ON) { - colstr->colon = BOLDBLUE "::" BOLD " "; - colstr->title = BOLD; - colstr->repo = BOLDMAGENTA; - colstr->version = BOLDGREEN; - colstr->groups = BOLDBLUE; - colstr->meta = BOLDCYAN; - colstr->warn = BOLDYELLOW; - colstr->err = BOLDRED; - colstr->nocolor = NOCOLOR; + colstr->colon = BOLDBLUE "::" BOLD " "; + colstr->title = BOLD; + colstr->repo = BOLDMAGENTA; + colstr->version = BOLDGREEN; + colstr->groups = BOLDBLUE; + colstr->meta = BOLDCYAN; + colstr->warn = BOLDYELLOW; + colstr->err = BOLDRED; + colstr->subtitle = FAINTBLACK; + colstr->nocolor = NOCOLOR; } else { - colstr->colon = ":: "; - colstr->title = ""; - colstr->repo = ""; - colstr->version = ""; - colstr->groups = ""; - colstr->meta = ""; - colstr->warn = ""; - colstr->err = ""; - colstr->nocolor = ""; + colstr->colon = ":: "; + colstr->title = ""; + colstr->repo = ""; + colstr->version = ""; + colstr->groups = ""; + colstr->meta = ""; + colstr->warn = ""; + colstr->err = ""; + colstr->subtitle = ""; + colstr->nocolor = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d954e637..41154c80 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -31,6 +31,7 @@ typedef struct __colstr_t { const char *meta; const char *warn; const char *err; + const char *subtitle; const char *nocolor; } colstr_t; diff --git a/src/pacman/util.c b/src/pacman/util.c index a3a85bb9..42e35360 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -409,20 +409,48 @@ char *strreplace(const char *str, const char *needle, const char *replace) static size_t string_length(const char *s) { - int len; - wchar_t *wcstr; - - if(!s || s[0] == '\0') { - return 0; - } - /* len goes from # bytes -> # chars -> # cols */ - len = strlen(s) + 1; - wcstr = calloc(len, sizeof(wchar_t)); - len = mbstowcs(wcstr, s, len); - len = wcswidth(wcstr, len); - free(wcstr); - - return len; + int len; + wchar_t *wcstr; + + if(!s || s[0] == '\0') { + return 0; + } + if (strstr(s, "\033")) { + char* source = s; + char* replaced = malloc(sizeof(char)*strlen(s)); + int mode = 0; + int iter = 0; + for (char character = *source; character != '\0'; character = *++source) { + if (mode == 0) { + if (character == '\033') { + mode = 1; + } else { + replaced[iter] = character; + iter++; + } + } else if (mode == 1) { + if (character == 'm') { + mode = 0; + } + } + } + replaced[++iter] = '\0'; + len = iter+1; + wcstr = calloc(len, sizeof(wchar_t)); + len = mbstowcs(wcstr, replaced, len); + len = wcswidth(wcstr, len); + free(wcstr); + free(replaced); + } else { + /* len goes from # bytes -> # chars -> # cols */ + len = strlen(s) + 1; + wcstr = calloc(len, sizeof(wchar_t)); + len = mbstowcs(wcstr, s, len); + len = wcswidth(wcstr, len); + free(wcstr); + } + + return len; } static void add_table_cell(alpm_list_t **row, char *label, int mode) @@ -905,14 +933,14 @@ static void _display_targets(alpm_list_t *targets, int verbose) } if(target->install) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), - alpm_pkg_get_version(target->install)); + pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->install), config->colstr.subtitle, + alpm_pkg_get_version(target->install), config->colstr.nocolor); } else if(isize == 0) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove)); + pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->remove), config->colstr.subtitle, + alpm_pkg_get_version(target->remove), config->colstr.nocolor); } else { - pm_asprintf(&str, "%s-%s [%s]", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove), _("removal")); + pm_asprintf(&str, "%s%s-%s %s[%s]%s", alpm_pkg_get_name(target->remove), config->colstr.subtitle, + alpm_pkg_get_version(target->remove), config->colstr.nocolor, _("removal"), config->colstr.nocolor); } names = alpm_list_add(names, str); } -- 2.25.1

1 0

[pacman-dev] [PATCH] Improved transaction summary appearance
by Carson Black 14 Mar '20

14 Mar '20

As for whether you can say the same about the code and developers... ¯\_(ツ)_/¯ Dealing with C really isn't my forte, but this: - hasn't segfaulted - seems to deal with memory safely I'm sure y'all will find something wrong with the code.

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-53-g87b74fcd
by Allan McRae 13 Mar '20

13 Mar '20

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 87b74fcd8257e3c2fbf2f2949f0561df7517ce71 (commit) via ddd5b0a462e7beb0e086bb51184934868ded3525 (commit) via 80ae80149a956adec75df159f66a9cb88e91f5cc (commit) via 0deff63efa6310ab0a00365b876eb8632abd6ab4 (commit) from e578903b60081bb8a7ddd094ed67946d5e48b719 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 87b74fcd8257e3c2fbf2f2949f0561df7517ce71 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Mon Mar 9 11:54:17 2020 -0700 Hide cursor while pacman is running Use ASCII control codes to hide cursor at the pacman start and then show the cursor when pacman finishes. It helps to avoid annoying blinking when progress bars are re-drawn. Cursor is reenabled if pacman expects user's input. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ddd5b0a462e7beb0e086bb51184934868ded3525 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 9 12:57:45 2020 +1000 Add file and line number to RET_ERR{,_VOID} Following the example of the recently added GOTO_ERR, adding the file and line number in addition to the function name in our debug messages is potentially useful. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80ae80149a956adec75df159f66a9cb88e91f5cc Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Fri Mar 6 12:00:15 2020 -0800 Add GOTO_ERR() macro to set error and then goto a label This is a macro similar to RET_ERR but useful in the case when we need to record an error and then jump to some cleanup section. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0deff63efa6310ab0a00365b876eb8632abd6ab4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 8 14:23:42 2020 +1000 Remove unneeded goto cleanup Since commit 2ee7a8d8, there is no cleanup needed in this function. Just return instead of jumping to the cleanup label. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 16 +++++----------- lib/libalpm/util.h | 9 +++++++-- src/pacman/pacman.c | 2 ++ src/pacman/sighandler.c | 4 ++++ src/pacman/util.c | 31 ++++++++++++++++++++++++++----- src/pacman/util.h | 6 ++++++ 6 files changed, 50 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Introduce alpm_dbs_update() function for parallel db updates
by Anatol Pomozov 13 Mar '20

13 Mar '20

This is an equivalent of alpm_db_update but for multiplexed (parallel) download. The difference is that this function accepts list of databases to update. And then ALPM internals download it in parallel if possible. Add a stub for _alpm_multi_download the function that will do parallel payloads downloads in the future. Introduce dload_payload->filepath field that contains url path to the file we download. It is like fileurl field but does not contain protocol/server part. The rationale for having this field is that with the curl multidownload the server retry logic is going to move to a curl callback. And the callback needs to be able to reconstruct the 'next' fileurl. One will be able to do it by getting the next server url from 'servers' list and then concat with filepath. Once the 'parallel download' refactoring is over 'fileurl' field will go away. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 2 + lib/libalpm/be_sync.c | 132 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/dload.c | 12 ++++ lib/libalpm/dload.h | 5 ++ 4 files changed, 151 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 93b97f44..eb0490eb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1045,6 +1045,8 @@ int alpm_db_remove_server(alpm_db_t *db, const char *url); */ int alpm_db_update(int force, alpm_db_t *db); +int alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force, int failfast); + /** Get a package entry from a package database. * @param db pointer to the package database to get the package from * @param name of the package diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index aafed15d..cdb46bd9 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -301,6 +301,138 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) return ret; } +/** Update list of databases. This function may run updates in parallel. + * + * @param dbs a list of alpm_db_t to update. + */ +int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force, UNUSED int failfast) { + char *syncpath; + const char *dbext = handle->dbext; + alpm_list_t *i; + int ret = -1; + mode_t oldmask; + alpm_list_t *payloads = NULL; + + /* Sanity checks */ + ASSERT(dbs != NULL, return -1); + handle->pm_errno = ALPM_ERR_OK; + + syncpath = get_sync_dir(handle); + ASSERT(syncpath != NULL, return -1); + + /* make sure we have a sane umask */ + oldmask = umask(0022); + + for(i = dbs; i; i = i->next) { + alpm_db_t *db = i->data; + int dbforce = force; + struct dload_payload *payload = NULL; + size_t len; + int siglevel; + + if(!(db->usage & ALPM_DB_USAGE_SYNC)) { + continue; + } + + ASSERT(db != handle->db_local, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1)); + + /* force update of invalid databases to fix potential mismatched database/signature */ + if(db->status & DB_STATUS_INVALID) { + dbforce = 1; + } + + CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + + /* set hard upper limit of 128MiB */ + payload->max_size = 128 * 1024 * 1024; + ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1)); + payload->servers = db->servers; + + /* print server + filename into a buffer */ + len = strlen(db->treename) + strlen(dbext) + 1; + MALLOC(payload->filepath, len, GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup)); + snprintf(payload->filepath, len, "%s%s", db->treename, dbext); + payload->handle = handle; + payload->force = dbforce; + payload->unlink_on_fail = 1; + + payloads = alpm_list_add(payloads, payload); + + siglevel = alpm_db_get_siglevel(db); + if(siglevel & ALPM_SIG_DATABASE) { + struct dload_payload *sig_payload; + CALLOC(sig_payload, 1, sizeof(*sig_payload), GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup)); + + /* print filename into a buffer (leave space for separator and .sig) */ + len = strlen(db->treename) + strlen(dbext) + 5; + MALLOC(sig_payload->filepath, len, goto cleanup); + snprintf(sig_payload->filepath, len, "%s%s.sig", db->treename, dbext); + + sig_payload->handle = handle; + sig_payload->force = dbforce; + sig_payload->errors_ok = (siglevel & ALPM_SIG_DATABASE_OPTIONAL); + + /* set hard upper limit of 16KiB */ + sig_payload->max_size = 16 * 1024; + sig_payload->servers = db->servers; + + payloads = alpm_list_add(payloads, sig_payload); + } + } + + /* attempt to grab a lock */ + if(_alpm_handle_lock(handle)) { + GOTO_ERR(handle, ALPM_ERR_HANDLE_LOCK, cleanup); + } + + ret = _alpm_multi_download(handle, payloads, syncpath); + if(ret < 0) { + goto cleanup; + } + + for(i = dbs; i; i = i->next) { + alpm_db_t *db = i->data; + if(!(db->usage & ALPM_DB_USAGE_SYNC)) { + continue; + } + + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); + + /* clear all status flags regarding validity/existence */ + db->status &= ~DB_STATUS_VALID; + db->status &= ~DB_STATUS_INVALID; + db->status &= ~DB_STATUS_EXISTS; + db->status &= ~DB_STATUS_MISSING; + + /* if the download failed skip validation to preserve the download error */ + if(sync_db_validate(db) != 0) { + /* pm_errno should be set */ + ret = -1; + } + } + +cleanup: + _alpm_handle_unlock(handle); + + if(ret == -1) { + /* pm_errno was set by the download code */ + _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync dbs: %s\n", + alpm_strerror(handle->pm_errno)); + } else { + handle->pm_errno = ALPM_ERR_OK; + } + + if(payloads) { + alpm_list_free_inner(payloads, (alpm_list_fn_free)_alpm_dload_payload_reset); + FREELIST(payloads); + } + free(syncpath); + umask(oldmask); + return ret; +} + /* Forward decl so I don't reorganize the whole file right now */ static int sync_db_read(alpm_db_t *db, struct archive *archive, struct archive_entry *entry, alpm_pkg_t **likely_pkg); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 670da03d..7cd3e3a4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -636,6 +636,16 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, } } +int _alpm_multi_download(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath) +{ + (void)handle; + (void)payloads; + (void)localpath; + return 0; +} + static char *filecache_find_url(alpm_handle_t *handle, const char *url) { const char *filebase = strrchr(url, '/'); @@ -738,6 +748,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) FREE(payload->destfile_name); FREE(payload->content_disp_name); FREE(payload->fileurl); + FREE(payload->filepath); *payload = (struct dload_payload){0}; } @@ -746,6 +757,7 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload) ASSERT(payload, return); FREE(payload->fileurl); + FREE(payload->filepath); payload->initial_size += payload->prevprogress; payload->prevprogress = 0; payload->unlink_on_fail = 0; diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 1e8f75f3..3eb7fbe1 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -31,6 +31,7 @@ struct dload_payload { char *destfile_name; char *content_disp_name; char *fileurl; + char *filepath; /* download URL path */ alpm_list_t *servers; long respcode; off_t initial_size; @@ -53,4 +54,8 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, char **final_file, const char **final_url); +int _alpm_multi_download(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath); + #endif /* ALPM_DLOAD_H */ -- 2.25.1

3 10

[pacman-dev] [PATCH v3] Hide cursor while pacman is running
by Anatol Pomozov 09 Mar '20

09 Mar '20

Use ASCII control codes to hide cursor at the pacman start and then show the cursor when pacman finishes. It helps to avoid annoying blinking when progress bars are re-drawn. Cursor is reenabled if pacman expects user's input. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/pacman.c | 2 ++ src/pacman/sighandler.c | 4 ++++ src/pacman/util.c | 31 ++++++++++++++++++++++++++----- src/pacman/util.h | 6 ++++++ 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d58c428a..fefd3fa4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -300,6 +300,7 @@ static void cleanup(int ret) /* free memory */ FREELIST(pm_targets); + console_cursor_show(); exit(ret); } @@ -1084,6 +1085,7 @@ int main(int argc, char *argv[]) int ret = 0; uid_t myuid = getuid(); + console_cursor_hide(); install_segv_handler(); /* i18n init */ diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index 46e6481f..fc4ea766 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -60,6 +60,8 @@ static void soft_interrupt_handler(int signum) const char msg[] = "\nHangup signal received\n"; xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1); } + xwrite(STDOUT_FILENO, CURSOR_SHOW_ANSICODE, + sizeof(CURSOR_SHOW_ANSICODE) - 1); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; @@ -95,6 +97,8 @@ static void segv_handler(int signum) const char msg[] = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; xwrite(STDERR_FILENO, msg, sizeof(msg) - 1); + xwrite(STDOUT_FILENO, CURSOR_SHOW_ANSICODE, + sizeof(CURSOR_SHOW_ANSICODE) - 1); /* restore the default handler */ _reset_handler(signum); diff --git a/src/pacman/util.c b/src/pacman/util.c index a640ffb4..a3a85bb9 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1391,6 +1391,27 @@ static int multiselect_parse(char *array, int count, char *response) return 0; } +void console_cursor_hide(void) { + if(isatty(fileno(stdout))) { + printf(CURSOR_HIDE_ANSICODE); + } +} + +void console_cursor_show(void) { + if(isatty(fileno(stdout))) { + printf(CURSOR_SHOW_ANSICODE); + } +} + +char *safe_fgets_stdin(char *s, int size) +{ + char *result; + console_cursor_show(); + result = safe_fgets(s, size, stdin); + console_cursor_hide(); + return result; +} + int multiselect_question(char *array, int count) { char *response, *lastchar; @@ -1427,7 +1448,7 @@ int multiselect_question(char *array, int count) flush_term_input(fileno(stdin)); - if(safe_fgets(response, response_len, stdin)) { + if(safe_fgets_stdin(response, response_len)) { const size_t response_incr = 64; size_t len; /* handle buffer not being large enough to read full line case */ @@ -1443,8 +1464,8 @@ int multiselect_question(char *array, int count) lastchar = response + response_len - 1; /* sentinel byte */ *lastchar = 1; - if(safe_fgets(response + response_len - response_incr - 1, - response_incr + 1, stdin) == 0) { + if(safe_fgets_stdin(response + response_len - response_incr - 1, + response_incr + 1) == 0) { free(response); return -1; } @@ -1494,7 +1515,7 @@ int select_question(int count) flush_term_input(fileno(stdin)); - if(safe_fgets(response, sizeof(response), stdin)) { + if(safe_fgets_stdin(response, sizeof(response))) { size_t len = strtrim(response); if(len > 0) { int n; @@ -1582,7 +1603,7 @@ static int question(short preset, const char *format, va_list args) flush_term_input(fd_in); - if(safe_fgets(response, sizeof(response), stdin)) { + if(safe_fgets_stdin(response, sizeof(response))) { size_t len = strtrim(response); if(len == 0) { return preset; diff --git a/src/pacman/util.h b/src/pacman/util.h index 2cee479f..2b21f3d5 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -28,6 +28,9 @@ #include "util-common.h" +#define CURSOR_HIDE_ANSICODE "\x1B[?25l" +#define CURSOR_SHOW_ANSICODE "\x1B[?25h" + #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ @@ -77,6 +80,9 @@ int colon_printf(const char *format, ...) __attribute__((format(printf, 1, 2))); int yesno(const char *format, ...) __attribute__((format(printf, 1, 2))); int noyes(const char *format, ...) __attribute__((format(printf, 1, 2))); char *arg_to_string(int argc, char *argv[]); +char *safe_fgets_stdin(char *s, int size); +void console_cursor_hide(void); +void console_cursor_show(void); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.25.1

2 1

[pacman-dev] [PATCH v2] Hide cursor while pacman is running
by Anatol Pomozov 09 Mar '20

09 Mar '20

Use ASCII control codes to hide cursor at the pacman start and then show the cursor when pacman finishes. It helps to avoid annoying blinking when progress bars are re-drawn. Cursor is reenabled if pacman expects user's input. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/common/util-common.c | 13 +++++++++++++ src/common/util-common.h | 3 +++ src/pacman/pacman.c | 2 ++ src/pacman/sighandler.c | 5 +++++ src/pacman/util.c | 19 ++++++++++++++----- src/pacman/util.h | 1 + 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/common/util-common.c b/src/common/util-common.c index 7d43ac0d..3850cffb 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -21,6 +21,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "util-common.h" @@ -104,6 +105,18 @@ int llstat(char *path, struct stat *buf) return ret; } +void console_hide_cursor(void) { + if(isatty(fileno(stdout))) { + printf("\x1B[?25l"); + } +} + +void console_show_cursor(void) { + if(isatty(fileno(stdout))) { + printf("\x1B[?25h"); + } +} + /** Wrapper around fgets() which properly handles EINTR * @param s string to read into * @param size maximum length to read diff --git a/src/common/util-common.h b/src/common/util-common.h index 483d5da4..8eacde7e 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -28,6 +28,9 @@ char *mdirname(const char *path); int llstat(char *path, struct stat *buf); +void console_hide_cursor(void); +void console_show_cursor(void); + char *safe_fgets(char *s, int size, FILE *stream); void wordsplit_free(char **ws); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d58c428a..aafd9e63 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -300,6 +300,7 @@ static void cleanup(int ret) /* free memory */ FREELIST(pm_targets); + console_show_cursor(); exit(ret); } @@ -1084,6 +1085,7 @@ int main(int argc, char *argv[]) int ret = 0; uid_t myuid = getuid(); + console_hide_cursor(); install_segv_handler(); /* i18n init */ diff --git a/src/pacman/sighandler.c b/src/pacman/sighandler.c index 46e6481f..59aaa61f 100644 --- a/src/pacman/sighandler.c +++ b/src/pacman/sighandler.c @@ -27,6 +27,9 @@ #include "sighandler.h" #include "util.h" +/* the same ANSI sequence as used in console_show_cursor */ +#define SHOW_CURSOR_ANSI "\x1B[?25h" + /** Write function that correctly handles EINTR. */ static ssize_t xwrite(int fd, const void *buf, size_t count) @@ -60,6 +63,7 @@ static void soft_interrupt_handler(int signum) const char msg[] = "\nHangup signal received\n"; xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1); } + xwrite(STDOUT_FILENO, SHOW_CURSOR_ANSI, sizeof(SHOW_CURSOR_ANSI) - 1); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; @@ -95,6 +99,7 @@ static void segv_handler(int signum) const char msg[] = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; xwrite(STDERR_FILENO, msg, sizeof(msg) - 1); + xwrite(STDOUT_FILENO, SHOW_CURSOR_ANSI, sizeof(SHOW_CURSOR_ANSI) - 1); /* restore the default handler */ _reset_handler(signum); diff --git a/src/pacman/util.c b/src/pacman/util.c index a640ffb4..7dfbdbca 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1391,6 +1391,15 @@ static int multiselect_parse(char *array, int count, char *response) return 0; } +char *safe_fgets_stdin(char *s, int size) +{ + char *result; + console_show_cursor(); + result = safe_fgets(s, size, stdin); + console_hide_cursor(); + return result; +} + int multiselect_question(char *array, int count) { char *response, *lastchar; @@ -1427,7 +1436,7 @@ int multiselect_question(char *array, int count) flush_term_input(fileno(stdin)); - if(safe_fgets(response, response_len, stdin)) { + if(safe_fgets_stdin(response, response_len)) { const size_t response_incr = 64; size_t len; /* handle buffer not being large enough to read full line case */ @@ -1443,8 +1452,8 @@ int multiselect_question(char *array, int count) lastchar = response + response_len - 1; /* sentinel byte */ *lastchar = 1; - if(safe_fgets(response + response_len - response_incr - 1, - response_incr + 1, stdin) == 0) { + if(safe_fgets_stdin(response + response_len - response_incr - 1, + response_incr + 1) == 0) { free(response); return -1; } @@ -1494,7 +1503,7 @@ int select_question(int count) flush_term_input(fileno(stdin)); - if(safe_fgets(response, sizeof(response), stdin)) { + if(safe_fgets_stdin(response, sizeof(response))) { size_t len = strtrim(response); if(len > 0) { int n; @@ -1582,7 +1591,7 @@ static int question(short preset, const char *format, va_list args) flush_term_input(fd_in); - if(safe_fgets(response, sizeof(response), stdin)) { + if(safe_fgets_stdin(response, sizeof(response))) { size_t len = strtrim(response); if(len == 0) { return preset; diff --git a/src/pacman/util.h b/src/pacman/util.h index 2cee479f..fbc5f33c 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -77,6 +77,7 @@ int colon_printf(const char *format, ...) __attribute__((format(printf, 1, 2))); int yesno(const char *format, ...) __attribute__((format(printf, 1, 2))); int noyes(const char *format, ...) __attribute__((format(printf, 1, 2))); char *arg_to_string(int argc, char *argv[]); +char *safe_fgets_stdin(char *s, int size); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.25.1

3 4

[pacman-dev] [PATCH] Provides generation for files (a.k.a. rpm fileattrs for makepkg)
by Carson Black 09 Mar '20

09 Mar '20

Whenever I'm working in a relatively fresh Arch environment, my work flow looks like this: - cmake .. -DFLAGS=blahblahblah - Wait a few seconds - Package providing KF5whatever not found - Try and deduce Arch package name from CMake package name Often, trying to figure out the relation between the build system package names and the Arch package names of missing dependencies ends up being the longest part of whatever task I was working on, which isn't very efficient. Compare this to me working in an RPM distro: - cmake .. -DFLAGS=blahblahblah - Wait a few seconds - Package providing KF5whatever not found - dnf install cmake(KF5whatever) The latter workflow is a lot more efficient, and is exactly what this commit introduces to packages generated by makepkg. Every file is iterated over at the end of the build process to generate additional provides without the packager needing to manually specify them. The code is architected in a manner designed to make it trivial to add new provider autogenerators. So far, there are autogenerated providers for: - pkgconfig(package) - cmake(package) - desktop files * app(desktopfilename) * can-open-mimetype(mimetype) * can-open-file-extension(filetype) While these automatically generated provides can be used for packaging, this is intended more for interactive usage rather than an attempt to change how Arch packaging works. Signed-off-by: Carson Black <uhhadd(a)gmail.com> --- scripts/makepkg.sh.in | 108 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca3e7459..10703a91 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -520,6 +520,111 @@ find_libdepends() { (( ${#libdepends[@]} )) && printf '%s\n' "${libdepends[@]}" } +pkgconfig_fileattr() { + case $1 in + --generate-provides) + case $2 in + *.pc) + directory="`dirname ${2}`" + export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" + pkg-config --print-provides "$2" 2>/dev/null | while read name _ _; do + [ -n "$name" ] || continue + echo "pkgconfig($name)" + done + ;; + esac + ;; + --generate-depends) + ;; + esac +} + +cmake_fileattr() { + case $1 in + --generate-provides) + case $2 in + *.cmake) + base="$(basename $2)" + case $2 in + *Config.cmake) + echo "cmake(${base%Config.cmake})" + ;; + *-config.cmake) + echo "cmake(${base%-config.cmake})" + ;; + esac + ;; + esac + ;; + --generate-depends) + ;; + esac +} + +desktop_file_attr() { + case $1 in + --generate-provides) + case "$2" in + *.desktop) + grep -q "Type=Application" "$2" || return + grep -q "Exec=" "$2" || return + base="$(basename $2)" + echo "app(${base%.desktop})" + + IFS=';' + mimetypes=`grep MimeType= $2 | cut -d '=' -f 2` + for mimetype in $mimetypes; do + echo "can-open-mimetype($mimetype)" + + IFS=' ' + filetypes=`grep -v ^\# /etc/mime.types | grep $mimetype | cut -d ' ' | xargs` + for filetype in $filetypes; do + echo "can-open-file-extension($filetype)" + done + done + ;; + esac + ;; + --generate-depends) + ;; + esac +} + +check_pkg_dir() { + if [[ ! -d $pkgdir ]]; then + error "$(gettext "Missing %s directory.")" "\$pkgdir/" + plain "$(gettext "Aborting...")" + exit $E_MISSING_PKGDIR + fi +} + +find_fileattrs_provides() { + check_pkg_dir + + for file in `find $pkgdir`; do + for function in $(declare -F); do + case $function in + *_fileattr) + $function --generate-provides $file + ;; + esac + done + done +} + +find_fileattrs_depends() { + check_pkg_dir + + for file in `find $pkgdir`; do + for function in $(declare -F); do + case $function in + *_fileattr) + $function --generate-depends $file + ;; + esac + done + done +} find_libprovides() { local p libprovides missing @@ -613,6 +718,9 @@ write_pkginfo() { mapfile -t provides < <(find_libprovides) mapfile -t depends < <(find_libdepends) + mapfile -t provides < <(find_fileattrs_provides) + mapfile -t depends < <(find_fileattrs_depends) + write_kv_pair "license" "${license[@]}" write_kv_pair "replaces" "${replaces[@]}" write_kv_pair "group" "${groups[@]}" -- 2.25.1

5 15

[pacman-dev] [PATCH v3] Add config option to specify amount of parallel download streams
by Anatol Pomozov 09 Mar '20

09 Mar '20

It includes pacman.conf new 'ParallelDownloads' option that specifies how many concurrent downloads cURL starts in parallel. Add alpm_option_set_parallel_downloads() ALPM function that allows to set this config option programmatically. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 5 ++++ etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 9 ++++++ lib/libalpm/handle.c | 15 ++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 56 ++++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 2 ++ 7 files changed, 89 insertions(+) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index b297e332..a1b708b9 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -205,6 +205,11 @@ Options Disable defaults for low speed limit and timeout on downloads. Use this if you have issues downloading files with proxy and/or security gateway. +*ParallelDownloads*:: + Specifies number of concurrent download streams. The value needs to be a + positive integer. If this config option is not set then only one download + stream is used (i.e. downloads happens sequentially). + Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7446944f..44cea408 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -34,6 +34,7 @@ Architecture = auto #TotalDownload CheckSpace #VerbosePkgLists +ParallelDownloads = 5 # PGP signature checking #SigLevel = Optional diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c2a069ad..5d559db1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -903,6 +903,15 @@ int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level); int alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout); +/** Sets number of parallel streams to download database and package files. + * If the function is not called then the default value of '1' stream + * (i.e. sequential download) is used. + * @param handle the context handle + * @param num_streams number of parallel download streams + * @return 0 on success, -1 on error + */ +int alpm_option_set_parallel_downloads(alpm_handle_t *handle, unsigned int num_streams); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index fc7c1faf..8ae08d11 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -856,3 +856,18 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, #endif return 0; } + +int SYMEXPORT alpm_option_set_parallel_downloads(alpm_handle_t *handle, + unsigned int num_streams) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + if(num_streams < 1) { + return -1; + } + handle->parallel_downloads = num_streams; +#else + (void)num_streams; /* silence unused variable warnings */ +#endif + return 0; +} diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c343f6e0..cd7104f9 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -61,6 +61,7 @@ struct __alpm_handle_t { /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ unsigned short disable_dl_timeout; + unsigned int parallel_downloads; /* number of download streams */ #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9de386f..6d731551 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -111,6 +111,8 @@ config_t *config_new(void) newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } + /* by default use 1 download stream */ + newconfig->parallel_downloads = 1; newconfig->colstr.colon = ":: "; newconfig->colstr.title = ""; newconfig->colstr.repo = ""; @@ -400,6 +402,32 @@ int config_set_arch(const char *arch) return 0; } +/** + * Parse a string into long number. The input string has to be non-empty + * and represent a number that fits long type. + * @param value the string to parse + * @param result pointer to long where the final result will be stored. + * This result is modified iff the input string parsed successfully. + * @return 0 in case if value parsed successfully, 1 otherwise. + */ +static int parse_number(char *value, long *result) { + char *endptr; + long val; + int invalid; + + errno = 0; /* To distinguish success/failure after call */ + val = strtol(value, &endptr, 10); + invalid = (errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) + || (*endptr != '\0') + || (endptr == value); + + if(!invalid) { + *result = val; + } + + return invalid; +} + /** * Parse a signature verification level line. * @param values the list of parsed option values @@ -677,6 +705,33 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "ParallelDownloads") == 0) { + long number; + int err; + + err = parse_number(value, &number); + if(err) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "ParallelDownloads", value); + return 1; + } + + if(number < 1) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: value for '%s' has to be positive : '%s'\n"), + file, linenum, "ParallelDownloads", value); + return 1; + } + + if(number > INT_MAX) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: value for '%s' is too large : '%s'\n"), + file, linenum, "ParallelDownloads", value); + return 1; + } + + config->parallel_downloads = number; } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -845,6 +900,7 @@ static int setup_libalpm(void) alpm_option_set_noextracts(handle, config->noextract); alpm_option_set_disable_dl_timeout(handle, config->disable_dl_timeout); + alpm_option_set_parallel_downloads(handle, config->parallel_downloads); for(i = config->assumeinstalled; i; i = i->next) { char *entry = i->data; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d954e637..42cddfbb 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -115,6 +115,8 @@ typedef struct __config_t { /* When downloading, display the amount downloaded, rate, ETA, and percent * downloaded of the total download list */ unsigned short totaldownload; + /* number of parallel download streams */ + unsigned int parallel_downloads; /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; -- 2.25.1

2 1