September 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC][PATCH] Introduce Include key globing for pacman.conf
by Marc - A. Dahlhaus 24 Mar '10

24 Mar '10

This patch adds the ability to use Include filenames containing wildcards and also expands the tilde to the homedirectory of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) { This patch addes the ability to use Include filenames containing wildcards and also expands the tilde to the homedir of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) {

4 15

[pacman-dev] [PATCH 1/2] print installed packages
by Xavier Chantry 10 Dec '09

10 Dec '09

Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/sync.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f101f9..896d028 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -274,6 +274,21 @@ static int sync_synctree(int level, alpm_list_t *syncs) return(success > 0); } +static void print_installed(pmpkg_t *pkg) +{ + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + pmpkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); + if(lpkg) { + const char *lpkgver = alpm_pkg_get_version(lpkg); + if(strcmp(lpkgver,pkgver) == 0) { + printf(" [%s]", _("installed")); + } else { + printf(_(" [%s: %s]"), _("installed"), lpkgver); + } + } +} + /* search the sync dbs for a matching package */ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) { @@ -330,6 +345,8 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + print_installed(pkg); + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); @@ -514,9 +531,12 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { pmpkg_t *pkg = alpm_list_getdata(j); + if (!config->quiet) { - printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + print_installed(pkg); + printf("\n"); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.6.4.2

3 6

[pacman-dev] Another proposal for the "-Sy libjpeg" problem
by Nagy Gabor 15 Nov '09

15 Nov '09

Hi! I think the problem is known for everyone, if a user upgrades a package (without -Su), he can easily get "error while loading shared libraries". The most perfect (but maybe overkill) solution is Florian's one: http://www.archlinux.org/pipermail/pacman-dev/2009-August/009158.html (that patch needs some work on optdepends side, but that is not so complicated.) I mention a simpler one: Add a new switch to upgrade reversedeps too (recursively), ie. "pacman -S --reversedeps libjpeg" would upgrade all packages depend on (the local) libjpeg. This should be straightforward to implement and imho this is a bit more sophisticated than the "pacman -Syu libjpeg" request (see bugs.archlinux.org :-P). Opinions? Bye

3 2

[pacman-dev] gnupg package signing
by Xavier 02 Nov '09

02 Nov '09

Just to let you know that I resurrected the gpg branch there : http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=gpg I took Dan's newgpg branch (with a few changes) : http://code.toofishes.net/cgit/dan/pacman.git/commit/?h=newgpg then merged the pending patches we had : http://archlinux.org/pipermail/pacman-dev/2008-December/007808.html http://archlinux.org/pipermail/pacman-dev/2008-December/007836.html http://archlinux.org/pipermail/pacman-dev/2008-December/007837.html and rebased it all on master. Actually I don't see what else needs to be done on the implementation side, it looks almost complete to me. Now the big remaining problem is everything related to key administration still needs to be figured out, and this is critical in term of security. But it might not need additional tool support.

3 7

[pacman-dev] makepkg test suite
by Allan McRae 20 Oct '09

20 Oct '09

Hi all, I am starting to write a test suite for makepkg. Hopefully this will make it more difficult to break things in the future... I have written a brief outline of how I have started implementing this here: http://wiki.archlinux.org/index.php/User:Allan/Makepkg_Test_Suite I realize that most issues with the implementation will be discovered as it goes on but any comments at this stage would be useful. Allan

2 3

[pacman-dev] [PATCH] Size handling was changed in fgets() functions
by Laszlo Papp 19 Oct '09

19 Oct '09

./src/pacman/util.c: - response size handling was changed in fgets() function, because it's easier to handle the source modification after a size modification ./lib/libalp/be_files.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification ./lib/libalpm/trans.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- lib/libalpm/be_files.c | 48 ++++++++++++++++++++++++------------------------ lib/libalpm/trans.c | 2 +- src/pacman/util.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 03a1463..01be4a2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -409,7 +409,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); + memset(line, 0, sizeof(line)); pkgpath = get_pkgpath(db, info); @@ -433,7 +433,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->name) != 0) { @@ -441,7 +441,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->version) != 0) { @@ -449,39 +449,39 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->filename, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, 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) { + if(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, 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) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->arch, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -497,7 +497,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->builddate = atol(line); } } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -513,12 +513,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->installdate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->packager, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); @@ -528,7 +528,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->size = atol(_alpm_strtrim(line)); @@ -539,19 +539,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } 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) { + if(fgets(line, sizeof(line)-1, 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) { + if(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->replaces = alpm_list_add(info->replaces, linedup); @@ -574,13 +574,13 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->backup = alpm_list_add(info->backup, linedup); @@ -602,24 +602,24 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, 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))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->provides = alpm_list_add(info->provides, linedup); @@ -638,7 +638,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1 fp) && strlen(_alpm_strtrim(line))) { pmdelta_t *delta = _alpm_delta_parse(line); if(delta) { info->deltas = alpm_list_add(info->deltas, delta); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c99f596..c182510 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -320,7 +320,7 @@ static int grep(const char *fn, const char *needle) } while(!feof(fp)) { char line[1024]; - fgets(line, 1024, fp); + fgets(line, sizeof(line), fp); if(feof(fp)) { continue; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 353aae3..c931bb2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -638,7 +638,7 @@ static int question(short preset, char *fmt, va_list args) return(preset); } - if(fgets(response, 32, stdin)) { + if(fgets(response, sizeof(response), stdin)) { strtrim(response); if(strlen(response) == 0) { return(preset); -- 1.6.4.4

6 10

[pacman-dev] word-wrapping when not outputting to a tty
by Oleg Finkelshteyn 14 Oct '09

14 Oct '09

I've noticed the following behaviour which makes it somewhat difficult to use -Qi/-Si/etc. in a pipeline: $ pacman -Si binutils ... Description : A set of programs to assemble and manipulate binary and object files $ pacman -Si binutils | cat Description : A set of programs to assemble and manipulate binary and object files I'd expect pacman not word-wrapping the output in the second case, as it breaks the line-oriented nature of data. This happens because getcols() defaults to 80 when !isatty(1), but I'd rather like it not to word-wrap at all in this case, as we're outputting to something like a file or a pipe. In the former case, some text processing tool could do better anyway, and the current behavior makes the latter case hardly useful at all. Does that make sense? Basically I'm suggesting (maybe) getting rid of the isatty() check in getcols() and adding one around word-wrapping code in indentprint() and list_display(). An attempt at implementing the proposal above can be found at http://rain.ifmo.ru/~olegfink/pacman-wrap.patch (sorry for not inlining, I use gmail). Maybe there should be more code shared between the two routines, e.g. getcols() could return -1 when word wrapping shouldn't be done. Any thoughts? Thanks, oleg

6 11

[pacman-dev] [PATCH] FS#8798 - Allow -Qo to perform a functional 'which'
by Jatheendra 11 Oct '09

11 Oct '09

Hi all, This is a simple patch to add a "which" like functionality to pacman -Qo[Bug FS#8798]. This is my first patch ,so any constructive criticism is most welcome. Thanks, Shankar --- src/pacman/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..fb3bb92 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -55,6 +55,43 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip trailing '/' */ + while (path[len-1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname,bufptr) == 0) { + strncpy(filename,fullname,PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -66,21 +103,35 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename,alpm_list_getdata(t),PATH_MAX+1); + char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename,'/') == NULL) { + if((search_path(filename,&buf)) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } + if(S_ISDIR(buf.st_mode)) { pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine ownership of a directory\n")); @@ -140,6 +191,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.0.2

4 5

[pacman-dev] 3.3.2 release soon
by Xavier 08 Oct '09

08 Oct '09

Looks like we are going to need a new bugfix release sooner than expected. Just when 3.3.1 was released, two issues popped up : 1) the repo-add / CSIZE / any / symlink issue : http://code.toofishes.net/cgit/dan/pacman.git/commit/?h=maint&id=20aa17c276… 2) the infinite download issue : http://bugs.archlinux.org/task/16359 That's also an occasion for translators to do a quick update if needed (but there are no modified/new strings). Especially Swedish and Chinese since these two were not fully translated for 3.3.1

4 15

[pacman-dev] [PATCH] Remove makepath function from frontend
by Laszlo Papp 01 Oct '09

01 Oct '09

Remove makepath function from pacman frontend, because _alpm_makepath(_mode) is good enough from the libalpm API, so it was duplicated in fact, and this function from the API may be paramiterized with permission rights, while makepath from frontend not. It's a cleaning activity too, at last it wasn't used. ./src/pacman/util.c: - this source code contained the makepath() function definition ./src/pacman/util.h: - this header file contained the makepath() function declaration Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/util.c | 36 ------------------------------------ src/pacman/util.h | 1 - 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 353aae3..8f6948d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -99,42 +99,6 @@ int getcols(void) return 0; } -/* does the same thing as 'mkdir -p' */ -int makepath(const char *path) -{ - /* A bit of pointer hell here. Descriptions: - * orig - a copy of path so we can safely butcher it with strsep - * str - the current position in the path string (after the delimiter) - * ptr - the original position of str after calling strsep - * incr - incrementally generated path for use in access/mkdir call - */ - char *orig, *str, *ptr, *incr; - mode_t oldmask = umask(0000); - int ret = 0; - - orig = strdup(path); - incr = calloc(strlen(orig) + 1, sizeof(char)); - str = orig; - while((ptr = strsep(&str, "/"))) { - if(strlen(ptr)) { - /* we have another path component- append the newest component to - * existing string and create one more level of dir structure */ - strcat(incr, "/"); - strcat(incr, ptr); - if(access(incr, F_OK)) { - if(mkdir(incr, 0755)) { - ret = 1; - break; - } - } - } - } - free(orig); - free(incr); - umask(oldmask); - return(ret); -} - /* does the same thing as 'rm -rf' */ int rmrf(const char *path) { diff --git a/src/pacman/util.h b/src/pacman/util.h index a71de2d..7a8c39d 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -41,7 +41,6 @@ int trans_init(pmtransflag_t flags); int trans_release(void); int needs_root(void); int getcols(void); -int makepath(const char *path); int rmrf(const char *path); char *mbasename(const char *path); char *mdirname(const char *path); -- 1.6.4.4

4 3