- Pacman-dev - lists.archlinux.org

[pacman-dev] Empty repo databases
by Allan McRae 24 Sep '09

24 Sep '09

Hi, With the community-testing repo now being empty, I get the following: > pacman -Syu :: Synchronizing package databases... kernel64 is up to date testing 10.3K 21.2K/s 00:00:00 [#####################] 100% core 33.8K 34.8K/s 00:00:01 [#####################] 100% extra 429.2K 13.0K/s 00:00:33 [#####################] 100% error: failed retrieving file 'community-testing.db.tar.gz' from <"mirror"> : Not Found error: failed to update community-testing (Not Found) community 365.3K 10.2K/s 00:00:36 [#####################] 100% :: Starting full system upgrade... local database is up to date Can we leave a shell database somehow when using repo-rm on the last package? It seems [testing] has never been empty! Allan

5 8

[pacman-dev] [PATCH] Separate file parsing from backend
by Henning Garus 23 Sep '09

23 Sep '09

Split the huge list of else ifs which was used for parsing 'desc', 'depends', 'files' and 'deltas' files, into separate functions and move them to a new file parse.c . This makes it possible for other backends to share the same parse code. Also change the parsing from the giant else if list to a single loop calling different functions as specified in an array of parser structs (see parse_lines() for details). Move _alpm_delta_parse to parse.c and make it static. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- I actually managed to make it longer, instead of shorter (well if you take out comments and license headers this version is roughly as long as the old one), however I think it is more readable. Feel free to call it overkill though. I don't really like the ugets stuff I used to get the next line, but I wanted this to work on something other than FILE*, even though this is not used (yet), and this was the best thing I could come up with. I toyed around with using fopencookie, but that sucks when it comes to portability (there is funopen on bsd, beyond that you are simply screwed). I removed the memset for the line array, it should be fairly safe and I ran valgrind with several pactests and it did not shout at me (at least after I supressed the numerous leaks reported for bash). Btw, is there a reason why pacman uses two different file formats (line based in db files vs. keyword = value in .PKGINFO ? lib/libalpm/Makefile.am | 1 + lib/libalpm/be_files.c | 222 +++++----------------------------- lib/libalpm/delta.c | 56 --------- lib/libalpm/delta.h | 1 - lib/libalpm/parse.c | 305 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/parse.h | 40 ++++++ 6 files changed, 377 insertions(+), 248 deletions(-) create mode 100644 lib/libalpm/parse.c create mode 100644 lib/libalpm/parse.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..5ed8866 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -27,6 +27,7 @@ libalpm_la_SOURCES = \ backup.h backup.c \ be_files.c \ be_package.c \ + parse.h parse.c \ cache.h cache.c \ conflict.h conflict.c \ db.h db.c \ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 21533ef..1066b60 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -31,7 +31,6 @@ #include <ctype.h> #include <time.h> #include <limits.h> /* PATH_MAX */ -#include <locale.h> /* setlocale */ /* libalpm */ #include "db.h" @@ -42,9 +41,9 @@ #include "alpm.h" #include "handle.h" #include "package.h" -#include "delta.h" #include "deps.h" #include "dload.h" +#include "parse.h" /* @@ -386,7 +385,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; - char line[513]; + char *pkgname = NULL; + char *pkgver = NULL; char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -417,9 +417,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); - /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); - pkgpath = get_pkgpath(db, info); if(access(pkgpath, F_OK)) { @@ -429,6 +426,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } + /* DESC */ if(inforeq & INFRQ_DESC) { snprintf(path, PATH_MAX, "%sdesc", pkgpath); @@ -436,139 +434,26 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - if(fgets(line, 256, fp) == NULL) { - break; - } - _alpm_strtrim(line); - if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->name) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->version) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } - } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } - } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } - } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } - } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); - /* also store this value to isize if isize is unset */ - if(info->isize == 0) { - info->isize = info->size; - } - } else if(strcmp(line, "%ISIZE%") == 0) { - /* ISIZE (installed size) tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%MD5SUM%") == 0) { - /* MD5SUM tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } - } else if(strcmp(line, "%FORCE%") == 0) { - info->force = 1; - } + STRDUP(pkgname, info->name, goto error); + STRDUP(pkgver, info->version, goto error); + if(_alpm_parse_desc(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } + if(strcmp(pkgname,info->name) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name mismatch " + "on package %s\n"), db->treename, pkgname); + } + if(strcmp(pkgver,info->version) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version mismatch " + "on package %s\n"), db->treename, pkgver); + } + FREE(pkgname); + FREE(pkgver); + /* store size in isize if isize is unset */ + if(info->isize == 0) { + info->isize = info->size; + } + fclose(fp); fp = NULL; } @@ -580,21 +465,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(fgets(line, 256, fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } - } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } - } + if(_alpm_parse_files(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -607,33 +479,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } - } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } - } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } - } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } - } + if(_alpm_parse_depends(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -643,17 +490,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DELTAS) { snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - info->deltas = alpm_list_add(info->deltas, delta); - } - } - } + if(_alpm_parse_deltas(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -675,6 +513,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) return(0); error: + free(pkgname); + free(pkgver); free(pkgpath); if(fp) { fclose(fp); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 523968e..5202e4b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -25,7 +25,6 @@ #include <stdint.h> /* intmax_t */ #include <limits.h> #include <sys/types.h> -#include <regex.h> /* libalpm */ #include "delta.h" @@ -247,61 +246,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } -/** Parses the string representation of a pmdelta_t object. - * This function assumes that the string is in the correct format. - * This format is as follows: - * $deltafile $deltamd5 $deltasize $oldfile $newfile - * @param line the string to parse - * @return A pointer to the new pmdelta_t object - */ -/* TODO this does not really belong here, but in a parsing lib */ -pmdelta_t *_alpm_delta_parse(char *line) -{ - pmdelta_t *delta; - char *tmp = line, *tmp2; - regex_t reg; - - regcomp(&reg, - "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" - " [^[:space:]]* [^[:space:]]*$", - REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - if(regexec(&reg, line, 0, 0, 0) != 0) { - /* delta line is invalid, return NULL */ - regfree(&reg); - return(NULL); - } - regfree(&reg); - - CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); - - return(delta); -} - void _alpm_delta_free(pmdelta_t *delta) { FREE(delta->from); diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 4f426cb..3c4e4cf 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -39,7 +39,6 @@ struct __pmdelta_t { off_t download_size; }; -pmdelta_t *_alpm_delta_parse(char *line); void _alpm_delta_free(pmdelta_t *delta); off_t _alpm_shortest_delta_path(alpm_list_t *deltas, const char *to, alpm_list_t **path); diff --git a/lib/libalpm/parse.c b/lib/libalpm/parse.c new file mode 100644 index 0000000..31038fc --- /dev/null +++ b/lib/libalpm/parse.c @@ -0,0 +1,305 @@ +/* + * parse.c + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <locale.h> /* setlocale */ +#include <regex.h> +#include <time.h> + +/* libalpm */ +#include "parse.h" +#include "util.h" +#include "alpm_list.h" +#include "log.h" +#include "package.h" +#include "delta.h" +#include "deps.h" + +enum { + PARSE_FINISHED = 0, + PARSE_UNFINISHED = 1, + PARSE_ERROR = 2 +}; + +typedef struct parser { + char *keyword; + int (*func)(char*, void*); + void *saveto; +} parser_t; + +/** Parses the string representation of a pmdelta_t object. + * This function assumes that the string is in the correct format. + * This format is as follows: + * $deltafile $deltamd5 $deltasize $oldfile $newfile + * @param line the string to parse + * @return A pointer to the new pmdelta_t object + */ +static pmdelta_t *delta_parse(char *line) +{ + pmdelta_t *delta; + char *tmp = line, *tmp2; + regex_t reg; + + regcomp(&reg, + "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" + " [^[:space:]]* [^[:space:]]*$", + REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + if(regexec(&reg, line, 0, 0, 0) != 0) { + /* delta line is invalid, return NULL */ + regfree(&reg); + return(NULL); + } + regfree(&reg); + + CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + delta->delta_size = atol(tmp2); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); + + return(delta); +} + +/** Parse line based data, as found in desc, depends, files and deltas files + * The data is expected to be in the following format: + * keyword + * [entry] + * [entry] + * ... + * <newline> + * [keyword] + * ... + * + * The handling of the data for each keyword is described by the matching + * struct of type parser_t. This struct holds a function pointer and a void + * pointer for each keyword. The function is called for the lines following a + * keyword until it returns PARSE_FINISHED. It is expected to handle the actual + * parsing and store the data at the passed void pointer. + * @param parsers describes how to parse data for each keyword + * @param nparsers size of parsers + * @param ugets pointer to an fgets like function, which gets called to get + * the next line + * @param from describes from where to read the next line, this is passed to + * ugets + */ +static int parse_lines(parser_t parsers[], int nparsers, ugets_t ugets, + void *from) +{ + int i, ret; + char line[513]; + parser_t *p = NULL; + + while((*ugets)(line, sizeof(line) - 1, from) != NULL) { + _alpm_strtrim(line); + if(p == NULL && strlen(line) == 0) { + continue; + } + if(p == NULL) { + for(i = 0; i < nparsers; i++) { + if(strcmp(line,parsers[i].keyword) == 0) { + p = &parsers[i]; + } + } + } + else { + ret = (*(p->func))(line, p->saveto); + if(ret == PARSE_FINISHED) { + p = NULL; + } + else if(ret == PARSE_ERROR) { + return(ret); + } + } + } + return(0); +} + +static int copy_line(char *line, void *target) { + STRDUP(*(char**)target, line, return(PARSE_ERROR)); + return(PARSE_FINISHED); +} + +static int parse_off_t(char *line, void *target) { + *(off_t*)target = (off_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_reason(char *line, void *target) { + *(pmpkgreason_t*)target = (pmpkgreason_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_date(char *line, void *target) { + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *(time_t*)target = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *(time_t*)target = atol(line); + } + return(PARSE_FINISHED); +} + +static int set_flag(char *line, void *target) { + *(unsigned short*)target = 1; + return(PARSE_FINISHED); +} + +static int copy_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + char *linedup; + STRDUP(linedup, line, RET_ERR(PM_ERR_MEMORY, PARSE_ERROR)); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, linedup); + return(PARSE_UNFINISHED); +} + +static int deltas_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdelta_t *delta = delta_parse(line); + if(delta != NULL) { + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, delta); + } + return(PARSE_UNFINISHED); +} + +static int deps_to_list(char *line, void *list) { + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdepend_t *dep = _alpm_splitdep(line); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, dep); + return(PARSE_UNFINISHED); +} + +char *_alpm_parse_from_file(char *buf,int size, void* fp) +{ + return(fgets(buf, size, (FILE*)fp)); +} + +char *_alpm_parse_from_archive(char *buf,int size, void* a) +{ + return(_alpm_archive_fgets(buf, size, (struct archive*)a)); +} + + +int _alpm_parse_desc(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%NAME%", &copy_line, &pkg->name}, + {"%VERSION%", &copy_line, &pkg->version}, + {"%FILENAME%", &copy_line, &pkg->filename}, + {"%DESC%", &copy_line, &pkg->desc}, + {"%GROUPS%", &copy_to_list, &pkg->groups}, + {"%URL%", &copy_line, &pkg->url}, + {"%LICENSE%", &copy_to_list, &pkg->licenses}, + {"%ARCH%", &copy_line, &pkg->arch}, + {"%BUILDDATE%", &parse_date, &pkg->builddate}, + {"%INSTALLDATE%", &parse_date, &pkg->installdate}, + {"%PACKAGER%", &copy_line, &pkg->packager}, + {"%REASON%", &parse_reason, &pkg->reason}, + {"%SIZE%", &parse_off_t, &pkg->size}, + {"%CSIZE%", &parse_off_t, &pkg->size}, + {"%ISIZE%", &parse_off_t, &pkg->isize}, + {"%MD5SUM%", &copy_line, &pkg->md5sum}, + {"%REPLACES%", &copy_to_list, &pkg->replaces}, + {"%FORCE%", &set_flag, &pkg->force} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_files(ugets_t ugets, void* from, + pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%FILES%", &copy_to_list, &pkg->files}, + {"%BACKUP%", &copy_to_list, &pkg->backup} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_depends(char* (*ugets)(char*, int, void*), void *from, + pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DEPENDS%", &deps_to_list, &pkg->depends}, + {"%OPTDEPENDS%", &copy_to_list, &pkg->optdepends}, + {"%CONFLICTS%", &copy_to_list, &pkg->conflicts}, + {"%PROVIDES%", &copy_to_list, &pkg->provides} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_deltas(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DELTAS%", &deltas_to_list, &pkg->deltas} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/parse.h b/lib/libalpm/parse.h new file mode 100644 index 0000000..d3ef77e --- /dev/null +++ b/lib/libalpm/parse.h @@ -0,0 +1,40 @@ +/* + * parse.h + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _ALPM_PARSE_H +#define _ALPM_PARSE_H + +#include "package.h" + +/* An fgets like function, argument for the parse functions */ +typedef char *(*ugets_t)(char*, int, void*); + +/* arguments for the parse functions (ugets_t) */ +char *_alpm_parse_from_file(char*, int, void*); +char *_alpm_parse_from_archive(char*, int, void*); + +/* parse functions */ +int _alpm_parse_desc(ugets_t, void*, pmpkg_t*); +int _alpm_parse_files(ugets_t, void*, pmpkg_t*); +int _alpm_parse_depends(ugets_t, void*, pmpkg_t*); +int _alpm_parse_deltas(ugets_t, void*, pmpkg_t*); + +#endif /* _ALPM_PARSE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.6.4.4

2 4

[pacman-dev] [PATCH] Separate file parsing from backend
by Henning Garus 23 Sep '09

23 Sep '09

Split the huge list of else ifs which was used for parsing 'desc', 'depends', 'files' and 'deltas' files, into separate functions and move them to a new file parse.c . This makes it possible for other backends to share the same parse code. Also change the parsing from the giant else if list to a single loop calling different functions as specified in an array of parser structs (see parse_lines() for details). Move _alpm_delta_parse to parse.c and make it static. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- Fix a stupid memleak I introduced in be_files.c by copying pkgname and version. Change all functions in parse to follow code conventions. lib/libalpm/Makefile.am | 1 + lib/libalpm/be_files.c | 223 +++++----------------------------- lib/libalpm/delta.c | 56 --------- lib/libalpm/delta.h | 1 - lib/libalpm/parse.c | 311 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/parse.h | 40 ++++++ 6 files changed, 384 insertions(+), 248 deletions(-) create mode 100644 lib/libalpm/parse.c create mode 100644 lib/libalpm/parse.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..5ed8866 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -27,6 +27,7 @@ libalpm_la_SOURCES = \ backup.h backup.c \ be_files.c \ be_package.c \ + parse.h parse.c \ cache.h cache.c \ conflict.h conflict.c \ db.h db.c \ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 21533ef..d969609 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -31,7 +31,6 @@ #include <ctype.h> #include <time.h> #include <limits.h> /* PATH_MAX */ -#include <locale.h> /* setlocale */ /* libalpm */ #include "db.h" @@ -42,9 +41,9 @@ #include "alpm.h" #include "handle.h" #include "package.h" -#include "delta.h" #include "deps.h" #include "dload.h" +#include "parse.h" /* @@ -386,7 +385,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; - char line[513]; + char *pkgname = NULL; + char *pkgver = NULL; char *pkgpath = NULL; ALPM_LOG_FUNC; @@ -417,9 +417,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", info->name, inforeq); - /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); - pkgpath = get_pkgpath(db, info); if(access(pkgpath, F_OK)) { @@ -429,6 +426,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } + /* DESC */ if(inforeq & INFRQ_DESC) { snprintf(path, PATH_MAX, "%sdesc", pkgpath); @@ -436,139 +434,29 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - if(fgets(line, 256, fp) == NULL) { - break; - } - _alpm_strtrim(line); - if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->name) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), info->version) != 0) { - _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " - "mismatch on package %s\n"), db->treename, info->name); - } - } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } - } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } - } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } - } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } - } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. - */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); - /* also store this value to isize if isize is unset */ - if(info->isize == 0) { - info->isize = info->size; - } - } else if(strcmp(line, "%ISIZE%") == 0) { - /* ISIZE (installed size) tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); - } else if(strcmp(line, "%MD5SUM%") == 0) { - /* MD5SUM tag only appears in sync repositories, - * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); - } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } - } else if(strcmp(line, "%FORCE%") == 0) { - info->force = 1; - } + /* name and version are already set and could be in use */ + pkgname = info->name; + pkgver = info->version; + if(_alpm_parse_desc(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } + if(strcmp(pkgname,info->name) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name mismatch " + "on package %s\n"), db->treename, pkgname); + } + if(strcmp(pkgver,info->version) != 0) { + _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version mismatch " + "on package %s\n"), db->treename, pkgver); + } + free(info->name); + info->name = pkgname; + free(info->version); + info->version = pkgver; + /* store size in isize if isize is unset */ + if(info->isize == 0) { + info->isize = info->size; + } + fclose(fp); fp = NULL; } @@ -580,21 +468,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(fgets(line, 256, fp)) { - _alpm_strtrim(line); - if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } - } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } - } + if(_alpm_parse_files(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -607,33 +482,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } - } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } - } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } - } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } - } + if(_alpm_parse_depends(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; @@ -643,17 +493,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(inforeq & INFRQ_DELTAS) { snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { - while(!feof(fp)) { - fgets(line, 255, fp); - _alpm_strtrim(line); - if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - info->deltas = alpm_list_add(info->deltas, delta); - } - } - } + if(_alpm_parse_deltas(&_alpm_parse_from_file, fp, info) != 0) { + goto error; } fclose(fp); fp = NULL; diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 523968e..5202e4b 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -25,7 +25,6 @@ #include <stdint.h> /* intmax_t */ #include <limits.h> #include <sys/types.h> -#include <regex.h> /* libalpm */ #include "delta.h" @@ -247,61 +246,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } -/** Parses the string representation of a pmdelta_t object. - * This function assumes that the string is in the correct format. - * This format is as follows: - * $deltafile $deltamd5 $deltasize $oldfile $newfile - * @param line the string to parse - * @return A pointer to the new pmdelta_t object - */ -/* TODO this does not really belong here, but in a parsing lib */ -pmdelta_t *_alpm_delta_parse(char *line) -{ - pmdelta_t *delta; - char *tmp = line, *tmp2; - regex_t reg; - - regcomp(&reg, - "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" - " [^[:space:]]* [^[:space:]]*$", - REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - if(regexec(&reg, line, 0, 0, 0) != 0) { - /* delta line is invalid, return NULL */ - regfree(&reg); - return(NULL); - } - regfree(&reg); - - CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); - - tmp2 = tmp; - tmp = strchr(tmp, ' '); - *(tmp++) = '\0'; - STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - tmp2 = tmp; - STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - - _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); - - return(delta); -} - void _alpm_delta_free(pmdelta_t *delta) { FREE(delta->from); diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 4f426cb..3c4e4cf 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -39,7 +39,6 @@ struct __pmdelta_t { off_t download_size; }; -pmdelta_t *_alpm_delta_parse(char *line); void _alpm_delta_free(pmdelta_t *delta); off_t _alpm_shortest_delta_path(alpm_list_t *deltas, const char *to, alpm_list_t **path); diff --git a/lib/libalpm/parse.c b/lib/libalpm/parse.c new file mode 100644 index 0000000..de699bd --- /dev/null +++ b/lib/libalpm/parse.c @@ -0,0 +1,311 @@ +/* + * parse.c + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <locale.h> /* setlocale */ +#include <regex.h> +#include <time.h> + +/* libalpm */ +#include "parse.h" +#include "util.h" +#include "alpm_list.h" +#include "log.h" +#include "package.h" +#include "delta.h" +#include "deps.h" + +enum { + PARSE_FINISHED = 0, + PARSE_UNFINISHED = 1, + PARSE_ERROR = 2 +}; + +typedef struct parser { + char *keyword; + int (*func)(char*, void*); + void *saveto; +} parser_t; + +/** Parses the string representation of a pmdelta_t object. + * This function assumes that the string is in the correct format. + * This format is as follows: + * $deltafile $deltamd5 $deltasize $oldfile $newfile + * @param line the string to parse + * @return A pointer to the new pmdelta_t object + */ +static pmdelta_t *delta_parse(char *line) +{ + pmdelta_t *delta; + char *tmp = line, *tmp2; + regex_t reg; + + regcomp(&reg, + "^[^[:space:]]* [[:xdigit:]]{32} [[:digit:]]*" + " [^[:space:]]* [^[:space:]]*$", + REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + if(regexec(&reg, line, 0, 0, 0) != 0) { + /* delta line is invalid, return NULL */ + regfree(&reg); + return(NULL); + } + regfree(&reg); + + CALLOC(delta, 1, sizeof(pmdelta_t), RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->delta_md5, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + delta->delta_size = atol(tmp2); + + tmp2 = tmp; + tmp = strchr(tmp, ' '); + *(tmp++) = '\0'; + STRDUP(delta->from, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + tmp2 = tmp; + STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); + + _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); + + return(delta); +} + +/** Parse line based data, as found in desc, depends, files and deltas files + * The data is expected to be in the following format: + * keyword + * [entry] + * [entry] + * ... + * <newline> + * [keyword] + * ... + * + * The handling of the data for each keyword is described by the matching + * struct of type parser_t. This struct holds a function pointer and a void + * pointer for each keyword. The function is called for the lines following a + * keyword until it returns PARSE_FINISHED. It is expected to handle the actual + * parsing and store the data at the passed void pointer. + * @param parsers describes how to parse data for each keyword + * @param nparsers size of parsers + * @param ugets pointer to an fgets like function, which gets called to get + * the next line + * @param from describes from where to read the next line, this is passed to + * ugets + */ +static int parse_lines(parser_t parsers[], int nparsers, ugets_t ugets, + void *from) +{ + int i, ret; + char line[513]; + parser_t *p = NULL; + + while((*ugets)(line, sizeof(line) - 1, from) != NULL) { + _alpm_strtrim(line); + if(p == NULL && strlen(line) == 0) { + continue; + } + if(p == NULL) { + for(i = 0; i < nparsers; i++) { + if(strcmp(line,parsers[i].keyword) == 0) { + p = &parsers[i]; + } + } + } + else { + ret = (*(p->func))(line, p->saveto); + if(ret == PARSE_FINISHED) { + p = NULL; + } + else if(ret == PARSE_ERROR) { + return(ret); + } + } + } + return(0); +} + +static int copy_line(char *line, void *target) +{ + STRDUP(*(char**)target, line, return(PARSE_ERROR)); + return(PARSE_FINISHED); +} + +static int parse_off_t(char *line, void *target) +{ + *(off_t*)target = (off_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_reason(char *line, void *target) +{ + *(pmpkgreason_t*)target = (pmpkgreason_t)atol(line); + return(PARSE_FINISHED); +} + +static int parse_date(char *line, void *target) +{ + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* initialize to null in case of failure */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *(time_t*)target = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *(time_t*)target = atol(line); + } + return(PARSE_FINISHED); +} + +static int set_flag(char *line, void *target) +{ + *(unsigned short*)target = 1; + return(PARSE_FINISHED); +} + +static int copy_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + char *linedup; + STRDUP(linedup, line, RET_ERR(PM_ERR_MEMORY, PARSE_ERROR)); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, linedup); + return(PARSE_UNFINISHED); +} + +static int deltas_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdelta_t *delta = delta_parse(line); + if(delta != NULL) { + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, delta); + } + return(PARSE_UNFINISHED); +} + +static int deps_to_list(char *line, void *list) +{ + if(strlen(line) == 0) { + return(PARSE_FINISHED); + } + pmdepend_t *dep = _alpm_splitdep(line); + *(alpm_list_t**)list = alpm_list_add(*(alpm_list_t**)list, dep); + return(PARSE_UNFINISHED); +} + +char *_alpm_parse_from_file(char *buf,int size, void* fp) +{ + return(fgets(buf, size, (FILE*)fp)); +} + +char *_alpm_parse_from_archive(char *buf,int size, void* a) +{ + return(_alpm_archive_fgets(buf, size, (struct archive*)a)); +} + + +int _alpm_parse_desc(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%NAME%", &copy_line, &pkg->name}, + {"%VERSION%", &copy_line, &pkg->version}, + {"%FILENAME%", &copy_line, &pkg->filename}, + {"%DESC%", &copy_line, &pkg->desc}, + {"%GROUPS%", &copy_to_list, &pkg->groups}, + {"%URL%", &copy_line, &pkg->url}, + {"%LICENSE%", &copy_to_list, &pkg->licenses}, + {"%ARCH%", &copy_line, &pkg->arch}, + {"%BUILDDATE%", &parse_date, &pkg->builddate}, + {"%INSTALLDATE%", &parse_date, &pkg->installdate}, + {"%PACKAGER%", &copy_line, &pkg->packager}, + {"%REASON%", &parse_reason, &pkg->reason}, + {"%SIZE%", &parse_off_t, &pkg->size}, + {"%CSIZE%", &parse_off_t, &pkg->size}, + {"%ISIZE%", &parse_off_t, &pkg->isize}, + {"%MD5SUM%", &copy_line, &pkg->md5sum}, + {"%REPLACES%", &copy_to_list, &pkg->replaces}, + {"%FORCE%", &set_flag, &pkg->force} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_files(ugets_t ugets, void* from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%FILES%", &copy_to_list, &pkg->files}, + {"%BACKUP%", &copy_to_list, &pkg->backup} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_depends(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DEPENDS%", &deps_to_list, &pkg->depends}, + {"%OPTDEPENDS%", &copy_to_list, &pkg->optdepends}, + {"%CONFLICTS%", &copy_to_list, &pkg->conflicts}, + {"%PROVIDES%", &copy_to_list, &pkg->provides} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +int _alpm_parse_deltas(ugets_t ugets, void *from, pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + parser_t parsers[] = { + {"%DELTAS%", &deltas_to_list, &pkg->deltas} + }; + int nparsers = sizeof(parsers) / sizeof(parser_t); + + return(parse_lines(parsers, nparsers, ugets, from)); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/parse.h b/lib/libalpm/parse.h new file mode 100644 index 0000000..d3ef77e --- /dev/null +++ b/lib/libalpm/parse.h @@ -0,0 +1,40 @@ +/* + * parse.h + * + * Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef _ALPM_PARSE_H +#define _ALPM_PARSE_H + +#include "package.h" + +/* An fgets like function, argument for the parse functions */ +typedef char *(*ugets_t)(char*, int, void*); + +/* arguments for the parse functions (ugets_t) */ +char *_alpm_parse_from_file(char*, int, void*); +char *_alpm_parse_from_archive(char*, int, void*); + +/* parse functions */ +int _alpm_parse_desc(ugets_t, void*, pmpkg_t*); +int _alpm_parse_files(ugets_t, void*, pmpkg_t*); +int _alpm_parse_depends(ugets_t, void*, pmpkg_t*); +int _alpm_parse_deltas(ugets_t, void*, pmpkg_t*); + +#endif /* _ALPM_PARSE_H */ + +/* vim: set ts=2 sw=2 noet: */ -- 1.6.4.4

1 0

[pacman-dev] cygwin and pactest weirdness
by Xavier 23 Sep '09

23 Sep '09

For the last few months, I have been getting random failures, at almost every make check run. For example : ================================================================================ Running 'sync042' Install a sync package conflicting with a local one -------------------------------------------------------------------------------- ==> Generating test environment Traceback (most recent call last): File "./pactest/pactest.py", line 104, in <module> env.run() File "/divers/pacman/pactest/pmenv.py", line 71, in run t.generate() File "/divers/pacman/pactest/pmtest.py", line 108, in generate shutil.rmtree(self.root) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 169, in rmtree rmtree(fullname, ignore_errors, onerror) File "/usr/lib/python2.5/shutil.py", line 178, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/usr/lib/python2.5/shutil.py", line 176, in rmtree os.rmdir(path) OSError: [Errno 90] Directory not empty: '/divers/pacman/root/var/lib/pacman/sync/sync/pkg1-1.0-1' make[2]: *** [check-local] Error 1 make[2]: Leaving directory `/divers/pacman' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/divers/pacman' make: *** [check-recursive] Error 1 make check 300.15s user 425.34s system 98% cpu 12:15.82 total $ ls /divers/pacman/root/var/lib/pacman/sync/sync/* /divers/pacman/root/var/lib/pacman/sync/sync/pkg1-1.0-1: /divers/pacman/root/var/lib/pacman/sync/sync/pkg2-1.0-1: depends desc It looks like pkg1 directory is actually empty afterward. So it looks like some odd race conditions. I am not sure what triggered it. Maybe I did a python update. Or my system/disk became slower. I don't really know, but it's quite annoying, and I am not sure what to do. I guess I should try to write a minimal testcase, like a python script creating and removing a bunch of files, see if I can reproduce it.

1 0

Re: [pacman-dev] [arch-general] Looking for czech and simplified chinese speakers for a quick pacman translation update
by Xavier 23 Sep '09

23 Sep '09

On Wed, Sep 23, 2009 at 3:21 PM, 甘露(Gan Lu) <rhythm.gan(a)gmail.com> wrote: > Sorry for being late, I am occupied by really busy life, haven't > checked my mail for days. > Don't worry, the only consequence is that 3.3.1 will have ~10 untranslated messages which will appear in English :) No big deal. Hopefully you will have time to catch up later on or to find an assistant :)

1 0

[pacman-dev] [translations] Add Swedish translation
by Laszlo Papp 23 Sep '09

23 Sep '09

Hello! Swedish translation is available here: http://djszapi.homelinux.net/0001-Add-Swedish-translation.patch Best regards, Laszlo Papp

3 5

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.1
by dan＠archlinux.org 23 Sep '09

23 Sep '09

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, maint has been updated via 7cead800c52e635d7f5010875cd8fcf99b93f4b2 (commit) via e76b3374d8372391b0cfefee829a660ccaba0d47 (commit) via 802b1a6f2f01b655c0ba46d3bafff9c5196c0542 (commit) via cfb86fed7cfa0f7b4a60a33bc203b0277a292ae4 (commit) via 38ac020f51ff248901d0455b6b5bd4260fa4f530 (commit) from 9c13a6c364e4b34cbec47cf0522707c8f5dfb856 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 1 + TRANSLATORS | 9 +- doc/index.txt | 1 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/cs.po | 24 +- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/en_GB.po | 6 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb_NO.po | 4 +- lib/libalpm/po/pl.po | 6 +- lib/libalpm/po/pt_BR.po | 31 +- lib/libalpm/po/ro.po | 6 +- lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/{nb_NO.po => sv_SE.po} | 288 +++++----- lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 6 +- po/LINGUAS | 1 + po/cs.po | 35 +- po/de.po | 6 +- po/en_GB.po | 6 +- po/es.po | 6 +- po/fr.po | 6 +- po/hu.po | 6 +- po/it.po | 6 +- po/kk.po | 6 +- po/nb_NO.po | 4 +- po/pacman.pot | 4 +- po/pl.po | 6 +- po/pt_BR.po | 39 +- po/ro.po | 6 +- po/ru.po | 6 +- po/{nb_NO.po => sv_SE.po} | 998 +++++++++++++++++---------------- po/tr.po | 6 +- po/uk.po | 6 +- po/zh_CN.po | 6 +- 41 files changed, 802 insertions(+), 794 deletions(-) copy lib/libalpm/po/{nb_NO.po => sv_SE.po} (53%) copy po/{nb_NO.po => sv_SE.po} (52%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.1-45-g86d4b8a
by dan＠archlinux.org 23 Sep '09

23 Sep '09

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 86d4b8a3aad8317ee4f7db9dc0d897a0809c0c04 (commit) via 7cead800c52e635d7f5010875cd8fcf99b93f4b2 (commit) via 5bea2c08a334421907fb7a53fe4ca9fdc9640056 (commit) via 0f834c93c7d33af8a828fc3753f46e92a868554f (commit) via e76b3374d8372391b0cfefee829a660ccaba0d47 (commit) via 802b1a6f2f01b655c0ba46d3bafff9c5196c0542 (commit) via cfb86fed7cfa0f7b4a60a33bc203b0277a292ae4 (commit) via 38ac020f51ff248901d0455b6b5bd4260fa4f530 (commit) via 9c13a6c364e4b34cbec47cf0522707c8f5dfb856 (commit) via c07aef0d6e75ea477b95665973ab3749e0181b78 (commit) from 03470c51ca5350567d3ac5fcce2441307f742c84 (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 86d4b8a3aad8317ee4f7db9dc0d897a0809c0c04 Merge: 5bea2c08a334421907fb7a53fe4ca9fdc9640056 7cead800c52e635d7f5010875cd8fcf99b93f4b2 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 22 21:38:16 2009 -0500 Merge branch 'maint' commit 5bea2c08a334421907fb7a53fe4ca9fdc9640056 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 21 14:47:16 2009 +1000 makepkg: tidy usage output Various tidying to the usage output - change "--config <config>" to "--config <file>" to prevent wrapping in a 80 character wide terminal - re-alphabetise options, including moving all long only opts to the end - use same indentation for additional pacman options - remove useless comment Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0f834c93c7d33af8a828fc3753f46e92a868554f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Sep 19 03:00:13 2009 +0200 testdb : fix many memleaks Yes, it was that bad :P We still have memleaks left because we cannot free the error data returned by libalpm, but pacman has the same issue. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 1 + TRANSLATORS | 6 + doc/index.txt | 1 + lib/libalpm/po/LINGUAS | 2 + lib/libalpm/po/cs.po | 24 +- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/en_GB.po | 6 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/{ro.po => nb_NO.po} | 287 +++++----- lib/libalpm/po/pl.po | 31 +- lib/libalpm/po/pt_BR.po | 31 +- lib/libalpm/po/ro.po | 6 +- lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/{ro.po => sv_SE.po} | 297 +++++------ lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 6 +- lib/libalpm/po/zh_CN.po | 6 +- po/LINGUAS | 2 + po/cs.po | 35 +- po/de.po | 6 +- po/en_GB.po | 6 +- po/es.po | 6 +- po/fr.po | 6 +- po/hu.po | 6 +- po/it.po | 6 +- po/kk.po | 6 +- po/{ro.po => nb_NO.po} | 1021 +++++++++++++++++------------------ po/pacman.pot | 4 +- po/pl.po | 39 +- po/pt_BR.po | 39 +- po/ro.po | 6 +- po/ru.po | 6 +- po/{ro.po => sv_SE.po} | 1031 ++++++++++++++++++------------------ po/tr.po | 6 +- po/uk.po | 6 +- po/zh_CN.po | 6 +- scripts/makepkg.sh.in | 19 +- src/util/testdb.c | 18 +- 43 files changed, 1489 insertions(+), 1543 deletions(-) copy lib/libalpm/po/{ro.po => nb_NO.po} (51%) copy lib/libalpm/po/{ro.po => sv_SE.po} (51%) copy po/{ro.po => nb_NO.po} (50%) copy po/{ro.po => sv_SE.po} (50%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.3.1, created. v3.3.1
by dan＠archlinux.org 23 Sep '09

23 Sep '09

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 annotated tag, v3.3.1 has been created at f72621b93b60338683308e26585904c736917d6f (tag) tagging 7cead800c52e635d7f5010875cd8fcf99b93f4b2 (commit) replaces v3.3.0 tagged by Dan McGee on Tue Sep 22 21:37:25 2009 -0500 - Log ----------------------------------------------------------------- Maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkq5iewACgkQXC5GoPU6du38VQCfUcJQHnhwUcuaemgmB/Yn6wb6 k+cAnA1VoyAgR9Hrml79WzTSshXcnKRf =Z7hD -----END PGP SIGNATURE----- Allan McRae (2): makepkg: change to pkgdir before creating PKGINFO file Remove builddeps from option parser Baurzhan Muftakhidinov (1): Update Kazakh translation Dan McGee (9): Make fetch timeout actually 10 seconds Add 3.3.0 release to index.txt Revert "Fix a memleak involving lazy DB loading" Update en_GB translation Updates in prep for 3.3.1 release Kill -F option for good in option parsing Merge branch 'xav/trans' into maint Clean up translation file headers Update index.txt with new release Francois Charette (1): fix typos in makepkg.sh.in Giovanni Scafora (1): Update Italian translation Henning Garus (1): Configure: Check if libfetch version is >= 2.21 Juan Pablo González Tognarelli (1): Update Spanish translation Laszlo Papp (3): Strndup usage and small typo fix Add Norwegian translation Add Swedish translation Marc - A. Dahlhaus (1): Use full path to ldconfig Mateusz Herych (1): Update Polish translation Matthias Gorissen (1): Update German translation Nagy Gabor (4): Fix for FS#15810 Add makepkgopt to be_package.c Catch an untranslated warning in lib/remove.c Update Hungarian translation Ondrej Kucera (1): Update Czech translation Rodrigo Flores (1): Update Brazilian translation Roman Kyrylych (1): Update Ukrainian translation Samed Beyribey (1): Update Turkish translation Sergey Tereschenko (2): update russian translation Update Russian translation Volodia Macovei (1): Update Romanian translation Xavier Chantry (15): Add a missing newline. repo-add: clarify one message Quiet ShowSize with -Ss and -Qs query.c : return 1 when no package match re-add -g CFLAGS with --enable-debug dload.c : change the way to check for mtimes testdb : less verbose makepkg: new --skipinteg option makepkg: always keep sources symlinks Update the doc for --source Update doc and vim syntax for arch=any Fix a memleak involving lazy DB loading String improvements Update all pot and po files for 3.3.1 release Update french translation ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] Status of translations for pacman 3.3.1
by Giovanni Scafora 22 Sep '09

22 Sep '09

Hi guys, we have got four updated translations for pacman 3.3.1: Italian Turkish Hungarian Kazakh These translations are complete and perfect. I will be waiting for other translations. Regards, -- Arch Linux Developer http://www.archlinux.org http://www.archlinux.it

6 17

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-43-g9c13a6c
by dan＠archlinux.org 22 Sep '09

22 Sep '09

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, maint has been updated discards a3fd6007ed3ffe6208c72f0f1e6a3fd5b73da5fb (commit) via 9c13a6c364e4b34cbec47cf0522707c8f5dfb856 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (a3fd6007ed3ffe6208c72f0f1e6a3fd5b73da5fb) \ N -- N -- N (9c13a6c364e4b34cbec47cf0522707c8f5dfb856) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 9c13a6c364e4b34cbec47cf0522707c8f5dfb856 Author: Laszlo Papp <djszapi2(a)gmail.com> Date: Mon Sep 21 21:32:59 2009 +0200 Add Norwegian translation Signed-off-by: Hans-Kristian Arntzen <maister(a)archlinux.us> Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translations] Norwegian translation was added
by Laszlo Papp 22 Sep '09

22 Sep '09

Hello, Here is Norwegian translation for pacman. Best Regards, Laszlo Papp

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-43-ga3fd600
by dan＠archlinux.org 22 Sep '09

22 Sep '09

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, maint has been updated via a3fd6007ed3ffe6208c72f0f1e6a3fd5b73da5fb (commit) via c07aef0d6e75ea477b95665973ab3749e0181b78 (commit) from 338c6546ff86acbb25c1508439adfb89c3dea952 (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 a3fd6007ed3ffe6208c72f0f1e6a3fd5b73da5fb Author: Laszlo Papp <djszapi2(a)gmail.com> Date: Mon Sep 21 21:32:59 2009 +0200 :dd Norwegian translation Signed-off-by: Hans-Kristian Arntzen <maister(a)archlinux.us> Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c07aef0d6e75ea477b95665973ab3749e0181b78 Author: Mateusz Herych <heniekk(a)gmail.com> Date: Sat Sep 19 12:31:19 2009 -0700 Update Polish translation Signed-off-by: Giovanni Scafora <giovanni(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TRANSLATORS | 3 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{libalpm.pot => nb_NO.po} | 281 ++++---- lib/libalpm/po/pl.po | 25 +- po/LINGUAS | 1 + po/{ro.po => nb_NO.po} | 1019 +++++++++++++++--------------- po/pl.po | 33 +- 7 files changed, 667 insertions(+), 696 deletions(-) copy lib/libalpm/po/{libalpm.pot => nb_NO.po} (54%) copy po/{ro.po => nb_NO.po} (50%) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-83-g03470c5
by dan＠archlinux.org 22 Sep '09

22 Sep '09

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 03470c51ca5350567d3ac5fcce2441307f742c84 (commit) via ece8f6fb0bf73295645a13736b6f8a6bba779242 (commit) via e6efd1932b4df1fd7ee8130268abf80d8bd4a151 (commit) from 72883e3bcbc1ff2d46667fceb48c3c2c682cfe79 (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 03470c51ca5350567d3ac5fcce2441307f742c84 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 21 08:12:10 2009 -0500 Allow cache cleaning to process all cache directories Previously we only looked at the first cache directory returned by the library. This allows us to look at all cache directories for cleaning. In addition, change the way we do a full (-Scc) cache cleaning operation. Instead of removing the parent directory, remove each package one-by-one as in the -Sc case. This would be ideal for someone mounting a cache directory over NFS, as it ensures we don't wipe out the mountpoint from underneath the directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ece8f6fb0bf73295645a13736b6f8a6bba779242 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 21 08:09:00 2009 -0500 Propagate return status up in DB cleaning code We didn't look at the return status of sync_cleandb() in sync_cleandb_all(). Make it do so and return it up the call chain. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e6efd1932b4df1fd7ee8130268abf80d8bd4a151 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 21 08:03:07 2009 -0500 Add missing closedir calls in cache cleanup Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/sync.c | 77 ++++++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] Add missing closedir calls in cache cleanup
by Dan McGee 21 Sep '09

21 Sep '09

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index aa09117..837c2b3 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -93,11 +93,12 @@ static int sync_cleandb(const char *dbpath, int keep_used) { if(rmrf(path)) { pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove repository directory\n")); + closedir(dir); return(1); } } - } + closedir(dir); return(0); } @@ -215,6 +216,7 @@ static int sync_cleancache(int level) unlink(path); } } + closedir(dir); } else { /* full cleanup */ printf(_("Cache directory: %s\n"), cachedir); -- 1.6.4.4

2 3

[pacman-dev] [PATCH] makepkg: tidy usage output
by Allan McRae 21 Sep '09

21 Sep '09

Various tidying to the usage output - change "--config <config>" to "--config <file>" to prevent wrapping in a 80 character wide terminal - re-alphabetise options, including moving all long only opts to the end - use same indentation for additional pacman options - remove useless comment Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ac6db80..2941a5d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1427,31 +1427,30 @@ usage() { printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT" echo "$(gettext " -c, --clean Clean up work files after build")" echo "$(gettext " -C, --cleancache Clean up source files from the cache")" - printf "$(gettext " --config <config> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" echo "$(gettext " -d, --nodeps Skip all dependency checks")" echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" echo "$(gettext " -f, --force Overwrite existing package")" echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" - echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " -h, --help This help")" echo "$(gettext " -i, --install Install package after successful build")" echo "$(gettext " -L, --log Log package build process")" echo "$(gettext " -m, --nocolor Disable colorized output messages")" echo "$(gettext " -o, --nobuild Download and extract files only")" - printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" + printf "$(gettext " -p <file> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" - # fix flyspray feature request #2978 echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" - echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" - echo "$(gettext " --asroot Allow makepkg to run as root user")" - echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" - echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" + echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" + echo "$(gettext " --asroot Allow makepkg to run as root user")" + printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" + echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" + echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" echo echo "$(gettext "These options can be passed to pacman:")" echo - echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" - echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" + echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" echo printf "$(gettext "If -p is not specified, makepkg will look for '%s'")\n" "$BUILDSCRIPT" echo -- 1.6.4.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-80-g72883e3
by dan＠archlinux.org 20 Sep '09

20 Sep '09

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 72883e3bcbc1ff2d46667fceb48c3c2c682cfe79 (commit) via 6bfca2fd14d07a18d7000d1f9dd998428036656f (commit) via ef3716877032941f7882c11c5a091abef95ef983 (commit) via 481014e944731e2756e16a7283f8a10498cadba4 (commit) via f4809dcc9c27ac614e2a3381d4ecd8661beec8de (commit) via 338c6546ff86acbb25c1508439adfb89c3dea952 (commit) via 6685822e575797b1e38a1e9364b72bb6bca2f52f (commit) via 44cddb351b05bd629202b7cf9294c71852a542a9 (commit) via 6cd8d6bd053514debbb20cc6781948225a79ab9d (commit) via 90a06b1cf0e9579d96bc4abf52c71ee81cc7b843 (commit) via ccf7c31f52064facc3e8a57ab3e2c473efd4217c (commit) via 419c4a2afa63acca0ec2e1f0a73d291aeed96358 (commit) via 65e7682638c23f5b8f4d4c80339f1cbeddb40e37 (commit) via 259cb3aad4d5197544158259d585c15d454d79e7 (commit) via 9516d5afe68dbdff69f47737e3af4e8272530303 (commit) via 5d0734861fee40132d6830dfb940e5ef12165fa4 (commit) via 9424197b420f9c2fe41acaa3072df96369fe5b49 (commit) via ed9d459ee2e0f44ad6365b2027db1486363b649e (commit) via 922448a9bf097ccdca176e952c240a1e4ca69992 (commit) via 9d4448dc7f559a3048f270f439927f67dbbfd5df (commit) via 9505c594fd1b32c768ccffcd77808049ea6491e4 (commit) via 1df3b91931ea28fa6b279a976339f099a111238d (commit) via 08ee4059b5935ab0b378a40dcfb127f169e96f83 (commit) from 95cb4b6874424c7109df0f8cebefc17d3756d65f (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 72883e3bcbc1ff2d46667fceb48c3c2c682cfe79 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 14 22:44:51 2009 -0500 Fully implement database lazy loading Commit 34e1413d75 attempted to implement lazy loading of package databases. Although it took care of my main complaint (creating the database directory if it didn't exist), it didn't allow sync repos to be registered before alpm_option_set_dbpath() had been called. With this patch, we no longer compute the individual repository DB paths until necessary, allowing full lazy loading to work as intended, and allowing us to drop the extra setlibpath() calls from the frontend. This allows the changes introduced in a2cd48960 (but later reverted) to be added back in again. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6bfca2fd14d07a18d7000d1f9dd998428036656f Merge: ef3716877032941f7882c11c5a091abef95ef983 338c6546ff86acbb25c1508439adfb89c3dea952 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 20 12:09:10 2009 -0500 Merge branch 'maint' Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c commit ef3716877032941f7882c11c5a091abef95ef983 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Sep 15 12:30:32 2009 +0200 Ask user confirmation for -R operation, too After commit 0da96abc, pacman always asks user confirmation for -U, so it is more coherent to doing that for -R, too. Btw, most users use -Rs always, so they won't notice any change. In the old code the -Ru operation was forgotten: Though it is a not "dangerous" operation, but the target list can be changed by that, too. Non-interactive scripts should always use --noconfirm (unexpected questions can be asked by all transactions). [That's why we should always default to the safest answers.] I've also added a pkglist != NULL sanity check (because -Ru can empty target list in trans_prepare part). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 481014e944731e2756e16a7283f8a10498cadba4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Sep 18 16:45:04 2009 +0200 delta : simple code refactoring This will make the code re-usable for other purpose. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f4809dcc9c27ac614e2a3381d4ecd8661beec8de Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Sep 15 16:07:25 2009 +0200 sync.c : duplicate the target before modifying it It was probably a bad idea to modify the target directly in case of repo/pkg syntax. Duplicating it also allows us to keep the original target string, which is more informative when printing errors. Also remove a duplicated error message from libalpm, and improve the message already returned to the frontend. $ pacman -S foo/bar before error: repository 'foo' not found error: 'bar': no such repository after error: 'foo/bar': could not find repository for target Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++ configure.ac | 4 +- lib/libalpm/add.c | 15 ++-- lib/libalpm/be_files.c | 41 +++++--- lib/libalpm/db.c | 61 +++++++----- lib/libalpm/db.h | 8 +- lib/libalpm/delta.c | 67 +++++++----- lib/libalpm/error.c | 2 +- lib/libalpm/po/cs.po | 22 +++-- lib/libalpm/po/de.po | 25 +++-- lib/libalpm/po/en_GB.po | 26 +++-- lib/libalpm/po/es.po | 40 +++++--- lib/libalpm/po/fr.po | 20 +++- lib/libalpm/po/hu.po | 20 +++- lib/libalpm/po/it.po | 37 ++++--- lib/libalpm/po/kk.po | 23 +++-- lib/libalpm/po/libalpm.pot | 16 ++- lib/libalpm/po/pl.po | 22 +++-- lib/libalpm/po/pt_BR.po | 22 +++-- lib/libalpm/po/ro.po | 18 +++- lib/libalpm/po/ru.po | 22 +++-- lib/libalpm/po/tr.po | 22 +++-- lib/libalpm/po/uk.po | 58 ++++++----- lib/libalpm/po/zh_CN.po | 22 +++-- lib/libalpm/remove.c | 16 ++-- lib/libalpm/sync.c | 1 - po/cs.po | 34 +++++-- po/de.po | 35 +++++-- po/en_GB.po | 38 +++++-- po/es.po | 99 +++++++++++------- po/fr.po | 40 ++++++-- po/hu.po | 31 ++++-- po/it.po | 56 +++++++--- po/kk.po | 37 +++++-- po/pacman.pot | 27 ++++- po/pl.po | 34 +++++-- po/pt_BR.po | 34 +++++-- po/ro.po | 35 +++++-- po/ru.po | 36 +++++-- po/tr.po | 51 ++++++--- po/uk.po | 250 +++++++++++++++++++++++-------------------- po/zh_CN.po | 34 +++++-- scripts/makepkg.sh.in | 2 +- src/pacman/package.c | 2 +- src/pacman/pacman.c | 15 +-- src/pacman/query.c | 4 +- src/pacman/remove.c | 26 ++--- src/pacman/sync.c | 36 ++++--- 48 files changed, 1036 insertions(+), 562 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-41-g338c654
by dan＠archlinux.org 20 Sep '09

20 Sep '09

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, maint has been updated via 338c6546ff86acbb25c1508439adfb89c3dea952 (commit) via 6685822e575797b1e38a1e9364b72bb6bca2f52f (commit) via 44cddb351b05bd629202b7cf9294c71852a542a9 (commit) via 6cd8d6bd053514debbb20cc6781948225a79ab9d (commit) via 90a06b1cf0e9579d96bc4abf52c71ee81cc7b843 (commit) via ccf7c31f52064facc3e8a57ab3e2c473efd4217c (commit) via 419c4a2afa63acca0ec2e1f0a73d291aeed96358 (commit) via 65e7682638c23f5b8f4d4c80339f1cbeddb40e37 (commit) via 259cb3aad4d5197544158259d585c15d454d79e7 (commit) via 9516d5afe68dbdff69f47737e3af4e8272530303 (commit) via 5d0734861fee40132d6830dfb940e5ef12165fa4 (commit) via 9424197b420f9c2fe41acaa3072df96369fe5b49 (commit) from ed9d459ee2e0f44ad6365b2027db1486363b649e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/de.po | 23 +++--- lib/libalpm/po/es.po | 40 +++++---- lib/libalpm/po/hu.po | 18 ++-- lib/libalpm/po/it.po | 36 ++++---- lib/libalpm/po/kk.po | 22 ++--- lib/libalpm/po/ro.po | 16 ++-- lib/libalpm/po/ru.po | 20 ++-- lib/libalpm/po/tr.po | 20 ++-- lib/libalpm/po/uk.po | 56 ++++++------ po/de.po | 27 +++--- po/es.po | 92 +++++++++---------- po/hu.po | 24 ++--- po/it.po | 48 +++++----- po/kk.po | 31 +++---- po/ro.po | 28 +++---- po/ru.po | 28 +++---- po/tr.po | 43 ++++----- po/uk.po | 242 +++++++++++++++++++++++++------------------------- src/pacman/package.c | 2 +- src/pacman/pacman.c | 4 +- 20 files changed, 399 insertions(+), 421 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translations] Updated Polish translation
by Mateusz Herych 19 Sep '09

19 Sep '09

Hello. Here is updated Polish translation for pacman 3.3.1. Regards, Mateusz.

2 1

[pacman-dev] [PATCH] Allow package to display a brief message before sync install
by James Rayner 19 Sep '09

19 Sep '09

The aim of this is to alert a user to system/package breaking updates before they happen and before they approve the sync install. This is intended primarily for kernel/initscripts/pacman, etc updates when things could go really wrong and need to be known beforehand. Example output below. This adds an alert="" option to the PKGBUILD. This entry is then stored in the package and then the db with repo-add. On a pacman sync operation if any has an alert message it will be displayed before "Proceed with installation" This is a really basic implementation that I'm sure could be brushed up, as I've not used C for a while. However the pacman code is very clean and easy to read, so that made it pretty trivial to add. There's an example repo with one package "alert" at http://mess.iphitus.org/alert-test/ The PKGBUILD for the aforementioned package: http://mess.iphitus.org/alert-test/PKGBUILD Attached patch is against latest git. James # Example output (note: the format is pkgname: message) iphitus(~/projects/alert/pacman)$ sudo pacman -S alert resolving dependencies... looking for inter-conflicts... Targets (1): alert-1-1 Total Download Size: 0.00 MB Total Installed Size: 0.00 MB alert: This package has an alert message. It may contain tacos. Proceed with installation? [Y/n]

11 40

[pacman-dev] IgnorePkg + IgnoreGroup +"-Qu"
by Xyne 18 Sep '09

18 Sep '09

Hi, I just wanted to ask if the output of "pacman -Qu" is meant to contain ignored packages and groups or if that's a bug. I don't believe it did so previously. Regards, Xyne

2 2

[pacman-dev] [Translations] NEW update Romanian translations
by volodia macovei 18 Sep '09

18 Sep '09

Sorry for mistakes... Fixed all. A new archive with both pacman_ro.po and libalpm_ro.po Thanks

2 1

[pacman-dev] kernel26-firmware and third-party kernels
by Ray Rashif 17 Sep '09

17 Sep '09

Hey all Would it be OK (as in KISS) to shove in a custom kernel's equivalent firmware into /lib/firmware/$(uname -r)? By looking at the /lib/udev/firmware.sh script it's one of the default look-up paths. But if I (and subsequent third-party packagers) start doing this, it will break the consistency as kernel26's firmware are in that dir. The only resolution here is that kernel26 uses /lib/firmware/$(uname -r) as well. I'm pretty sure that the blobs are hardware-dependent and not software, but from looking at the kernel26 buildscripts so far it appears they are being bumped for every minor revision update. Why is this being done? If there is indeed no problem whatsoever and any kernel can use firmware of any version, then this case can be dismissed :) Regards

2 2

[pacman-dev] [translation] Updated Ukrainian translation
by Roman Kyrylych 17 Sep '09

17 Sep '09

Hi! Here is an updated translation. Besides updates for 3.3.1 it includes many other fixes thanks to Danylo Korostil <ted.korostiled(a)gmail.com> -- Roman Kyrylych (Роман Кирилич)

2 1

[pacman-dev] [translation] Russian translation for pacman 3.3.1
by partizan 17 Sep '09

17 Sep '09

this is updated translation for russian.

2 1