--- config.c 2000/12/13 13:19:08 1.1
+++ config.c 2000/12/13 15:40:34 1.2
@@ -1,10 +1,39 @@
/*
- * $Source: /v/ossp/cvs/ossp-pkg/petidomo/libconfigfile/config.c,v $
- * $Revision: 1.1 $
- * $Date: 2000/12/13 13:19:08 $
+ * $Source: /v/ossp/cvs/ossp-pkg/petidomo/libconfigfile/config.c,v $
+ * $Revision: 1.2 $
+ * $Date: 2000/12/13 15:40:34 $
*
- * Copyright (C) 1996,97 CyberSolutions GmbH.
- * All rights reserved.
+ * Copyright (c) 1996-99 by Peter Simons <simons@cys.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Peter Simons.
+ *
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <fcntl.h>
@@ -135,7 +164,7 @@
should do a consistency check first. If the line passes,
there're no surprises when we actually parse it. */
- if ((text_easy_pattern_match(currLine, "^[[:alnum:]_-]+[\t ]+[^\t ]")) == FALSE) {
+ if ((text_easy_pattern_match(currLine, "^[[:alnum:]_-]+[[:space:]]+[^[:space:]]+.*[^[:space:]]+[[:space:]]*$")) == FALSE) {
syslog(LOG_WARNING, "ReadConfig: Line \"%s\" is syntactically incorrect.",
currLine);
continue; /* ignore it */
@@ -143,7 +172,7 @@
/* Remove all unnecessary whitespace. */
- rc = text_transform_text(currLine, currLine, "^([^\t ]+)[\t ]+([^\t ].*)[\t ]*$", "\\1 \\2");
+ rc = text_transform_text(currLine, currLine, "^([[:alnum:]_-]+)[[:space:]]+([^[:space:]]+.*[^[:space:]]+)[[:space:]]*$", "\\1 \\2");
if (rc != 0) {
syslog(LOG_WARNING, "ReadConfig: Internal error while parsing line: %d.", rc);
continue; /* ignore it */
|
