nss-pam-ldapd branch master updated. 0.9.6-20-g917ded7
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd branch master updated. 0.9.6-20-g917ded7
- From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd branch master updated. 0.9.6-20-g917ded7
- Date: Tue, 24 May 2016 22:33:40 +0200 (CEST)
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 "nss-pam-ldapd".
The branch, master has been updated
via 917ded70b410907d4408f33dbf3d4eda1e46c8bf (commit)
from 4be9c599b1d09294a42bb97e52c87fb3c43690b7 (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 -----------------------------------------------------------------
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=917ded70b410907d4408f33dbf3d4eda1e46c8bf
commit 917ded70b410907d4408f33dbf3d4eda1e46c8bf
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Tue May 24 22:32:56 2016 +0200
Refactor out expression parsing to functions
This moves the parsing of the various ${var...} expressions to separate
functions so they can be extended more easily.
diff --git a/common/expr.c b/common/expr.c
index c434a14..2b12e74 100644
--- a/common/expr.c
+++ b/common/expr.c
@@ -2,7 +2,7 @@
expr.c - limited shell-like expression parsing functions
This file is part of the nss-pam-ldapd library.
- Copyright (C) 2009, 2010, 2011, 2012, 2013 Arthur de Jong
+ Copyright (C) 2009-2016 Arthur de Jong
Copyright (c) 2012 Thorsten Glaser <t.glaser@tarent.de>
This library is free software; you can redistribute it and/or
@@ -81,6 +81,99 @@ MUST_USE static const char *parse_expression(
const char *str, int *ptr, int endat, char *buffer, size_t
buflen,
expr_expander_func expander, void *expander_arg);
+/* handle ${attr:-word} expressions */
+MUST_USE static const char *parse_dollar_default(
+ const char *str, int *ptr, char *buffer, size_t buflen,
+ expr_expander_func expander, void *expander_arg,
+ const char *varvalue)
+{
+ if ((varvalue != NULL) && (*varvalue != '\0'))
+ {
+ /* value is set, skip rest of expression and use value */
+ if (parse_expression(str, ptr, '}', buffer, buflen, empty_expander, NULL)
== NULL)
+ return NULL;
+ if (strlen(varvalue) >= buflen)
+ return NULL;
+ strcpy(buffer, varvalue);
+ }
+ else
+ {
+ /* value is not set, evaluate rest of expression */
+ if (parse_expression(str, ptr, '}', buffer, buflen, expander,
expander_arg) == NULL)
+ return NULL;
+ }
+ return buffer;
+}
+
+/* handle ${attr:+word} expressions */
+MUST_USE static const char *parse_dollar_alternative(
+ const char *str, int *ptr, char *buffer, size_t buflen,
+ expr_expander_func expander, void *expander_arg,
+ const char *varvalue)
+{
+ if ((varvalue != NULL) && (*varvalue != '\0'))
+ {
+ /* value is set, evaluate rest of expression */
+ if (parse_expression(str, ptr, '}', buffer, buflen, expander,
expander_arg) == NULL)
+ return NULL;
+ }
+ else
+ {
+ /* value is not set, skip rest of expression and blank */
+ if (parse_expression(str, ptr, '}', buffer, buflen, empty_expander, NULL)
== NULL)
+ return NULL;
+ buffer[0] = '\0';
+ }
+ return buffer;
+}
+
+/* handle ${attr#word} expressions */
+MUST_USE static const char *parse_dollar_match(
+ const char *str, int *ptr, char *buffer, size_t buflen,
+ const char *varvalue)
+{
+ char c;
+ const char *cp, *vp;
+ int ismatch;
+ size_t vallen;
+ cp = str + *ptr;
+ vp = varvalue;
+ ismatch = 1;
+ while (((c = *cp++) != '\0') && (c != '}'))
+ {
+ if (ismatch && (*vp =='\0'))
+ ismatch = 0; /* varvalue shorter than trim string */
+ if (c == '?')
+ {
+ /* match any one character */
+ vp++;
+ continue;
+ }
+ if (c == '\\')
+ {
+ if ((c = *cp++) == '\0')
+ return NULL; /* end of input: syntax error */
+ /* escape the next character c */
+ }
+ if (ismatch && (*vp != c))
+ ismatch = 0; /* they differ */
+ vp++;
+ }
+ if (c == '\0')
+ return NULL; /* end of input: syntax error */
+ /* at this point, cp points to after the closing } */
+ (*ptr) = cp - str - 1;
+ /* if ismatch, vp points to the beginning of the
+ data after trimming, otherwise vp is invalid */
+ if (!ismatch)
+ vp = varvalue;
+ /* now copy the (trimmed or not) value to the buffer */
+ if ((vallen = strlen(vp) + 1) > buflen)
+ return NULL;
+ memcpy(buffer, vp, vallen);
+ return buffer;
+}
+
MUST_USE static const char *parse_dollar_expression(
const char *str, int *ptr, char *buffer, size_t buflen,
expr_expander_func expander, void *expander_arg)
@@ -109,82 +202,22 @@ MUST_USE static const char *parse_dollar_expression(
{
/* if variable is not set or empty, substitute remainder */
(*ptr) += 2;
- if ((varvalue != NULL) && (*varvalue != '\0'))
- {
- /* value is set, skip rest of expression and use value */
- if (parse_expression(str, ptr, '}', buffer, buflen, empty_expander,
NULL) == NULL)
- return NULL;
- if (strlen(varvalue) >= buflen)
- return NULL;
- strcpy(buffer, varvalue);
- }
- else
- {
- /* value is not set, evaluate rest of expression */
- if (parse_expression(str, ptr, '}', buffer, buflen, expander,
expander_arg) == NULL)
- return NULL;
- }
+ if (parse_dollar_default(str, ptr, buffer, buflen, expander,
expander_arg, varvalue) == NULL)
+ return NULL;
}
else if (strncmp(str + *ptr, ":+", 2) == 0)
{
- /* if variable is set, substitute remainer */
+ /* if variable is set, substitute remainder */
(*ptr) += 2;
- if ((varvalue != NULL) && (*varvalue != '\0'))
- {
- /* value is set, evaluate rest of expression */
- if (parse_expression(str, ptr, '}', buffer, buflen, expander,
expander_arg) == NULL)
- return NULL;
- }
- else
- {
- /* value is not set, skip rest of expression and blank */
- if (parse_expression(str, ptr, '}', buffer, buflen, empty_expander,
NULL) == NULL)
- return NULL;
- buffer[0] = '\0';
- }
+ if (parse_dollar_alternative(str, ptr, buffer, buflen, expander,
expander_arg, varvalue) == NULL)
+ return NULL;
}
else if (str[*ptr] == '#')
{
- char c;
- const char *cp, *vp;
- int ismatch;
- size_t vallen;
+ /* try to strip the remainder value from variable beginning */
(*ptr) += 1;
- cp = str + *ptr;
- vp = varvalue;
- ismatch = 1;
- while (((c = *cp++) != '\0') && (c != '}'))
- {
- if (ismatch && (*vp =='\0'))
- ismatch = 0; /* varvalue shorter than trim string */
- if (c == '?')
- {
- /* match any one character */
- vp++;
- continue;
- }
- if (c == '\\')
- {
- if ((c = *cp++) == '\0')
- return NULL; /* end of input: syntax error */
- /* escape the next character c */
- }
- if (ismatch && (*vp != c))
- ismatch = 0; /* they differ */
- vp++;
- }
- if (c == '\0')
- return NULL; /* end of input: syntax error */
- /* at this point, cp points to after the closing } */
- (*ptr) = cp - str - 1;
- /* if ismatch, vp points to the beginning of the
- data after trimming, otherwise vp is invalid */
- if (!ismatch)
- vp = varvalue;
- /* now copy the (trimmed or not) value to the buffer */
- if ((vallen = strlen(vp) + 1) > buflen)
+ if (parse_dollar_match(str, ptr, buffer, buflen, varvalue) == NULL)
return NULL;
- memcpy(buffer, vp, vallen);
}
else
return NULL;
-----------------------------------------------------------------------
Summary of changes:
common/expr.c | 169 +++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 101 insertions(+), 68 deletions(-)
hooks/post-receive
--
nss-pam-ldapd
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/
- nss-pam-ldapd branch master updated. 0.9.6-20-g917ded7,
Commits of the nss-pam-ldapd project
