diff options
| author | Marc-A. Dahlhaus <mad@wol.de> | 2010-05-18 14:32:02 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-05-18 11:26:22 -0500 |
| commit | 5752e276fb585d07bd0f8e8b2a1f2827afdf2799 (patch) | |
| tree | f2f07a4ffb1df04c3edd2148d9dd65c6f2e0ff36 | |
| parent | a6ace987a913852af30bb5e3ae6bf145dc9c6157 (diff) | |
| download | pacman-5752e276fb585d07bd0f8e8b2a1f2827afdf2799.tar.xz | |
Allow to include a path containing wildcards
Dan: line wrapping and man page touchup.
Signed-off-by: Marc-A. Dahlhaus <mad@wol.de>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/pacman.conf.5.txt | 3 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 31 |
3 files changed, 32 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9760ba83..4307fb1b 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,7 @@ fi AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes") # Checks for header files. -AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h]) +AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h string.h strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h sys/time.h syslog.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 89c22a12..0e8426af 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -98,7 +98,8 @@ Options *Include =* path:: Include another config file. This file can include repositories or - general configuration options. + general configuration options. Wildcards in the specified paths will get + expanded based on linkman:glob[7] rules. *Architecture =* auto | i686 | x86_64 | ...:: If set, pacman will only allow installation of packages of the given diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6ecda052..78407d67 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -39,6 +39,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 @@ -967,9 +968,35 @@ static int _parseconfig(const char *file, const char *givensection, ret = 1; goto cleanup; } - pm_printf(PM_LOG_DEBUG, "config: including %s\n", value); /* Ignore include failures... assume non-critical */ - _parseconfig(value, section, db); + int globret; + glob_t globbuf; + globret = glob(value, GLOB_NOCHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, + "config file %s, line %d: include globing out of space\n", + file, linenum); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, + "config file %s, line %d: include globing read error for %s\n", + file, linenum, value); + break; + case GLOB_NOMATCH: + pm_printf(PM_LOG_DEBUG, + "config file %s, line %d: no include found for %s\n", + file, linenum, value); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config file %s, line %d: including %s\n", + file, linenum, globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } + globfree(&globbuf); continue; } if(strcmp(section, "options") == 0) { |