ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

libpkgconf: pkg: add variable whitespace warnings back, using pkgconf_warn().

pull/116/head
William Pitcock 2017-02-04 19:03:33 -06:00
parent bef293080a
commit 820ad83edd
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libpkgconf/pkg.c
View File

@ -238,6 +238,7 @@ pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename,
pkgconf_pkg_t *pkg; pkgconf_pkg_t *pkg;
char readbuf[PKGCONF_BUFSIZE]; char readbuf[PKGCONF_BUFSIZE];
char *idptr; char *idptr;
size_t lineno = 0;
pkg = calloc(sizeof(pkgconf_pkg_t), 1); pkg = calloc(sizeof(pkgconf_pkg_t), 1);
pkg->filename = strdup(filename); pkg->filename = strdup(filename);
@ -257,6 +258,9 @@ pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename,
while (pkgconf_fgetline(readbuf, PKGCONF_BUFSIZE, f) != NULL) while (pkgconf_fgetline(readbuf, PKGCONF_BUFSIZE, f) != NULL)
{ {
char op, *p, *key, *value; char op, *p, *key, *value;
bool warned_key_whitespace = false, warned_value_whitespace = false;
lineno++;
p = readbuf; p = readbuf;
while (*p && (isalpha((unsigned int)*p) || isdigit((unsigned int)*p) || *p == '_' || *p == '.')) while (*p && (isalpha((unsigned int)*p) || isdigit((unsigned int)*p) || *p == '_' || *p == '.'))
@ -268,6 +272,13 @@ pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename,
while (*p && isspace((unsigned int)*p)) while (*p && isspace((unsigned int)*p))
{ {
if (!warned_key_whitespace)
{
pkgconf_warn(client, "%s:%zu: warning: whitespace encountered while parsing key section\n",
pkg->filename, lineno);
warned_key_whitespace = true;
}
/* set to null to avoid trailing spaces in key */ /* set to null to avoid trailing spaces in key */
*p = '\0'; *p = '\0';
p++; p++;
@ -284,6 +295,13 @@ pkgconf_pkg_new_from_file(const pkgconf_client_t *client, const char *filename,
p = value + (strlen(value) - 1); p = value + (strlen(value) - 1);
while (*p && isspace((unsigned int) *p) && p > value) while (*p && isspace((unsigned int) *p) && p > value)
{ {
if (!warned_value_whitespace && op == '=')
{
pkgconf_warn(client, "%s:%zu: warning: trailing whitespace encountered while parsing value section\n",
pkg->filename, lineno);
warned_value_whitespace = true;
}
*p = '\0'; *p = '\0';
p--; p--;
} }