summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pacman/callback.c3
-rw-r--r--src/pacman/conf.h4
-rw-r--r--src/pacman/pacman.c225
-rw-r--r--src/pacman/query.c2
-rw-r--r--src/pacman/sync.c2
-rw-r--r--src/pacman/util.c59
-rw-r--r--src/pacman/util.h2
7 files changed, 289 insertions, 8 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index e13a7e7d..baefacc0 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -91,7 +91,6 @@ static float get_update_timediff(int first_call)
/* refactored from cb_trans_progress */
static void fill_progress(const int percent, const int proglen)
{
- const unsigned short chomp = alpm_option_get_chomp();
const unsigned int hashlen = proglen - 8;
const unsigned int hash = percent * hashlen / 100;
static unsigned int lasthash = 0, mouth = 0;
@@ -109,7 +108,7 @@ static void fill_progress(const int percent, const int proglen)
printf(" [");
for(i = hashlen; i > 1; --i) {
/* if special progress bar enabled */
- if(chomp) {
+ if(config->chomp) {
if(i > hashlen - hash) {
printf("-");
} else if(i == hashlen - hash) {
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 4fff0abb..8c55a2fc 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -54,6 +54,10 @@ typedef struct __config_t {
pmtransflag_t flags;
unsigned short noask;
unsigned int ask;
+ /* conf file options */
+ unsigned short chomp; /* I Love Candy! */
+ unsigned short usecolor; /* enable colorful output */
+ unsigned short showsize; /* show individual package sizes */
} config_t;
config_t *config_new(void);
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 0b95ac15..d09f9609 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -456,6 +456,229 @@ static int parseargs(int argc, char *argv[])
return(0);
}
+/* The real parseconfig. Called with a null section argument by the publicly
+ * visible parseconfig so we can recall from within ourself on an include */
+static int _parseconfig(const char *file, const char *givensection,
+ pmdb_t * const givendb)
+{
+ FILE *fp = NULL;
+ char line[PATH_MAX+1];
+ int linenum = 0;
+ char *ptr, *section = NULL;
+ pmdb_t *db = NULL;
+
+ fp = fopen(file, "r");
+ if(fp == NULL) {
+ return(1);
+ }
+
+ /* if we are passed a section, use it as our starting point */
+ if(givensection != NULL) {
+ section = strdup(givensection);
+ }
+ /* if we are passed a db, use it as our starting point */
+ if(givendb != NULL) {
+ db = givendb;
+ }
+
+ while(fgets(line, PATH_MAX, fp)) {
+ linenum++;
+ strtrim(line);
+
+ /* ignore whole line and end of line comments */
+ if(strlen(line) == 0 || line[0] == '#') {
+ continue;
+ }
+ if((ptr = strchr(line, '#'))) {
+ *ptr = '\0';
+ }
+
+ if(line[0] == '[' && line[strlen(line)-1] == ']') {
+ /* new config section, skip the '[' */
+ ptr = &line[1];
+ if(section) {
+ free(section);
+ }
+ section = strdup(ptr);
+ section[strlen(section)-1] = '\0';
+ printf(_("config: new section '%s'\n"), section);
+ if(!strlen(section)) {
+ printf("PM_ERR_CONF_BAD_SECTION\n");
+ return(1);
+ }
+ /* a section/database named local is not allowed */
+ if(!strcmp(section, "local")) {
+ printf("PM_ERR_CONF_LOCAL\n");
+ return(1);
+ }
+ /* if we are not looking at the options section, register a db */
+ if(strcmp(section, "options") != 0) {
+ db = alpm_db_register(section);
+ }
+ } else {
+ /* directive */
+ char *key;
+ const char *upperkey;
+ /* strsep modifies the 'line' string: 'key \0 ptr' */
+ key = line;
+ ptr = line;
+ strsep(&ptr, "=");
+ strtrim(key);
+ strtrim(ptr);
+
+ if(key == NULL) {
+ printf("PM_ERR_CONF_BAD_SYNTAX\n");
+ return(1);
+ }
+ upperkey = strtoupper(strdup(key));
+ if(section == NULL && (strcmp(key, "Include") == 0 || strcmp(upperkey, "INCLUDE") == 0)) {
+ printf("PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION\n");
+ return(1);
+ }
+ if(ptr == NULL) {
+ /* directives without settings */
+ /* TODO shouldn't we check if these are in the [options] section? */
+ if(strcmp(key, "NoPassiveFTP") == 0 || strcmp(upperkey, "NOPASSIVEFTP") == 0) {
+ alpm_option_set_nopassiveftp(1);
+ printf(_("config: nopassiveftp\n"));
+ } else if(strcmp(key, "UseSyslog") == 0 || strcmp(upperkey, "USESYSLOG") == 0) {
+ alpm_option_set_usesyslog(1);
+ printf(_("config: usesyslog\n"));
+ } else if(strcmp(key, "ILoveCandy") == 0 || strcmp(upperkey, "ILOVECANDY") == 0) {
+ config->chomp = 1;
+ printf(_("config: chomp\n"));
+ } else if(strcmp(key, "UseColor") == 0 || strcmp(upperkey, "USECOLOR") == 0) {
+ config->usecolor = 1;
+ printf(_("config: usecolor\n"));
+ } else if(strcmp(key, "ShowSize") == 0 || strcmp(upperkey, "SHOWSIZE") == 0) {
+ config->showsize= 1;
+ printf(_("config: showsize\n"));
+ } else {
+ printf("PM_ERR_CONF_BAD_SYNTAX\n");
+ return(1);
+ }
+ } else {
+ /* directives with settings */
+ if(strcmp(key, "Include") == 0 || strcmp(upperkey, "INCLUDE") == 0) {
+ int ret;
+ printf(_("config: including %s\n"), ptr);
+ ret = _parseconfig(ptr, section, db);
+ if(ret != 0) {
+ return(ret);
+ }
+ } else if(strcmp(section, "options") == 0) {
+ if(strcmp(key, "NoUpgrade") == 0 || strcmp(upperkey, "NOUPGRADE") == 0) {
+ /* TODO functionalize this */
+ char *p = ptr;
+ char *q;
+
+ while((q = strchr(p, ' '))) {
+ *q = '\0';
+ alpm_option_add_noupgrade(p);
+ printf(_("config: noupgrade: %s\n"), p);
+ p = q;
+ p++;
+ }
+ alpm_option_add_noupgrade(p);
+ printf(_("config: noupgrade: %s\n"), p);
+ } else if(strcmp(key, "NoExtract") == 0 || strcmp(upperkey, "NOEXTRACT") == 0) {
+ char *p = ptr;
+ char *q;
+
+ while((q = strchr(p, ' '))) {
+ *q = '\0';
+ alpm_option_add_noextract(p);
+ printf(_("config: noextract: %s\n"), p);
+ p = q;
+ p++;
+ }
+ alpm_option_add_noextract(p);
+ printf(_("config: noextract: %s\n"), p);
+ } else if(strcmp(key, "IgnorePkg") == 0 || strcmp(upperkey, "IGNOREPKG") == 0) {
+ char *p = ptr;
+ char *q;
+
+ while((q = strchr(p, ' '))) {
+ *q = '\0';
+ alpm_option_add_ignorepkg(p);
+ printf(_("config: ignorepkg: %s"), p);
+ p = q;
+ p++;
+ }
+ alpm_option_add_ignorepkg(p);
+ printf(_("config: ignorepkg: %s\n"), p);
+ } else if(strcmp(key, "HoldPkg") == 0 || strcmp(upperkey, "HOLDPKG") == 0) {
+ char *p = ptr;
+ char *q;
+
+ while((q = strchr(p, ' '))) {
+ *q = '\0';
+ alpm_option_add_holdpkg(p);
+ printf(_("config: holdpkg: %s\n"), p);
+ p = q;
+ p++;
+ }
+ alpm_option_add_holdpkg(p);
+ printf(_("config: holdpkg: %s\n"), p);
+ } else if(strcmp(key, "DBPath") == 0 || strcmp(upperkey, "DBPATH") == 0) {
+ alpm_option_set_dbpath(ptr);
+ printf(_("config: dbpath: %s\n"), ptr);
+ } else if(strcmp(key, "CacheDir") == 0 || strcmp(upperkey, "CACHEDIR") == 0) {
+ alpm_option_set_cachedir(ptr);
+ printf(_("config: cachedir: %s\n"), ptr);
+ } else if(strcmp(key, "RootDir") == 0 || strcmp(upperkey, "ROOTDIR") == 0) {
+ alpm_option_set_root(ptr);
+ printf(_("config: rootdir: %s\n"), ptr);
+ } else if (strcmp(key, "LogFile") == 0 || strcmp(upperkey, "LOGFILE") == 0) {
+ alpm_option_set_logfile(ptr);
+ printf(_("config: logfile: %s\n"), ptr);
+ } else if (strcmp(key, "LockFile") == 0 || strcmp(upperkey, "LOCKFILE") == 0) {
+ alpm_option_set_lockfile(ptr);
+ printf(_("config: lockfile: %s\n"), ptr);
+ } else if (strcmp(key, "XferCommand") == 0 || strcmp(upperkey, "XFERCOMMAND") == 0) {
+ alpm_option_set_xfercommand(ptr);
+ printf(_("config: xfercommand: %s\n"), ptr);
+ } else if (strcmp(key, "UpgradeDelay") == 0 || strcmp(upperkey, "UPGRADEDELAY") == 0) {
+ /* The config value is in days, we use seconds */
+ time_t ud = atol(ptr) * 60 * 60 *24;
+ alpm_option_set_upgradedelay(ud);
+ printf(_("config: upgradedelay: %d\n"), (int)ud);
+ } else {
+ printf("PM_ERR_CONF_BAD_SYNTAX\n");
+ return(1);
+ }
+ } else if(strcmp(key, "Server") == 0 || strcmp(upperkey, "SERVER") == 0) {
+ /* let's attempt a replacement for the current repo */
+ char *server = strreplace(ptr, "$repo", section);
+
+ if(alpm_db_setserver(db, server) != 0) {
+ /* pm_errno is set by alpm_db_setserver */
+ return(1);
+ }
+
+ free(server);
+ } else {
+ printf("PM_ERR_CONF_BAD_SYNTAX\n");
+ return(1);
+ }
+ }
+ }
+ }
+ fclose(fp);
+
+ return(0);
+}
+
+/** Parse a configuration file.
+ * @param file path to the config file.
+ * @return 0 on success, non-zero on error
+ */
+int parseconfig(const char *file)
+{
+ /* call the real parseconfig function with a null section & db argument */
+ return(_parseconfig(file, NULL, NULL));
+}
+
/**
* @brief Main function.
*
@@ -539,7 +762,7 @@ int main(int argc, char *argv[])
config->configfile = strdup(CONFFILE);
}
- if(alpm_parse_config(config->configfile, NULL, "") != 0) {
+ if(parseconfig(config->configfile) != 0) {
fprintf(stderr, _("error: failed to parse config (%s)\n"),
alpm_strerror(pm_errno));
cleanup(1);
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 258c1607..3e993bf0 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -150,7 +150,7 @@ static int query_search(alpm_list_t *targets)
printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
/* print the package size with the output if ShowSize option set */
- if(alpm_option_get_showsize()) {
+ if(config->showsize) {
/* Convert byte size to MB */
double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0);
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 9f345c69..92a1607a 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -250,7 +250,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets)
alpm_pkg_get_version(pkg));
/* print the package size with the output if ShowSize option set */
- if(alpm_option_get_showsize()) {
+ if(config->showsize) {
/* Convert byte size to MB */
double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0);
diff --git a/src/pacman/util.c b/src/pacman/util.c
index a5876122..e88001ac 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -209,6 +209,12 @@ char *strtoupper(char *str)
char *strtrim(char *str)
{
char *pch = str;
+
+ if(str == NULL || *str == '\0') {
+ /* string is empty, so we're done. */
+ return(str);
+ }
+
while(isspace(*pch)) {
pch++;
}
@@ -216,13 +222,62 @@ char *strtrim(char *str)
memmove(str, pch, (strlen(pch) + 1));
}
+ /* check if there wasn't anything but whitespace in the string. */
+ if(*str == '\0') {
+ return(str);
+ }
+
pch = (str + (strlen(str) - 1));
while(isspace(*pch)) {
pch--;
}
*++pch = '\0';
- return str;
+ return(str);
+}
+
+/* Helper function for strreplace */
+static void _strnadd(char **str, const char *append, unsigned int count)
+{
+ if(*str) {
+ *str = realloc(*str, strlen(*str) + count + 1);
+ } else {
+ *str = calloc(sizeof(char), count + 1);
+ }
+
+ strncat(*str, append, count);
+}
+
+/* Replace all occurances of 'needle' with 'replace' in 'str', returning
+ * a new string (must be free'd) */
+char *strreplace(const char *str, const char *needle, const char *replace)
+{
+ const char *p, *q;
+ p = q = str;
+
+ char *newstr = NULL;
+ unsigned int needlesz = strlen(needle),
+ replacesz = strlen(replace);
+
+ while (1) {
+ q = strstr(p, needle);
+ if(!q) { /* not found */
+ if(*p) {
+ /* add the rest of 'p' */
+ _strnadd(&newstr, p, strlen(p));
+ }
+ break;
+ } else { /* found match */
+ if(q > p){
+ /* add chars between this occurance and last occurance, if any */
+ _strnadd(&newstr, p, q - p);
+ }
+ _strnadd(&newstr, replace, replacesz);
+ p = q + needlesz;
+ }
+ }
+
+ return newstr;
}
void list_display(const char *title, alpm_list_t *list)
@@ -295,7 +350,7 @@ void display_targets(alpm_list_t *syncpkgs)
isize += alpm_pkg_get_isize(pkg);
/* print the package size with the output if ShowSize option set */
- if(alpm_option_get_showsize()) {
+ if(config->showsize) {
/* Convert byte size to MB */
mbdispsize = dispsize / (1024.0 * 1024.0);
diff --git a/src/pacman/util.h b/src/pacman/util.h
index 755b30e1..80d1b02c 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -43,7 +43,7 @@ int rmrf(const char *path);
void indentprint(const char *str, int indent);
char *strtoupper(char *str);
char *strtrim(char *str);
-int reg_match(char *string, char *pattern);
+char *strreplace(const char *str, const char *needle, const char *replace);
void list_display(const char *title, alpm_list_t *list);
void display_targets(alpm_list_t *syncpkgs);
int yesno(char *fmt, ...);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-26 14:56:15 +0000