Index: ossp-pkg/rc/rc_const.h RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_const.h,v rcsdiff -q -kk '-r1.34' '-r1.35' -u '/v/ossp/cvs/ossp-pkg/rc/rc_const.h,v' 2>/dev/null --- rc_const.h 2003/07/07 13:30:51 1.34 +++ rc_const.h 2003/07/11 08:49:36 1.35 @@ -143,7 +143,7 @@ #define RC_DEF_ON "1" /* Digital switch */ #define RC_DEF_OFF "0" /* Digital switch */ #define RC_DEF_TMP "/tmp" /* Temporary directory name */ -#define RC_DEF_DEF "^%(\\w+)[ \t]*(.*?)\\n(.*?)^$" /* Section definition */ +#define RC_DEF_DEF "(?:^|\\n)%(\\w+)[ \t]*(.*?)\\n(.*?)(?:\\n%|$)" /* Section definition */ #define RC_DEF_NCF "config" /* Config section name */ #define RC_DEF_CMN "common" /* Common section name */ #define RC_DEF_UIG "-u" /* Section user string */ Index: ossp-pkg/rc/rc_file.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_file.c,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/rc/rc_file.c,v' 2>/dev/null --- rc_file.c 2003/07/08 15:09:50 1.6 +++ rc_file.c 2003/07/11 08:49:36 1.7 @@ -149,7 +149,7 @@ int nSubstrings = 0; int *pnVec = NULL; const char *kszErr = NULL; - const int kiRegopt = PCRE_DOTALL | PCRE_MULTILINE; + const int kiRegopt = PCRE_DOTALL | PCRE_DOLLAR_ENDONLY; /*const int kiRegopt = PCRE_DOTALL | PCRE_MULTILINE | PCRE_UNGREEDY;*/ pcre *pRegex = NULL; /* Perl Compatible Regular Expression */ Index: ossp-pkg/rc/rc_script.c RCS File: /v/ossp/cvs/ossp-pkg/rc/rc_script.c,v rcsdiff -q -kk '-r1.35' '-r1.36' -u '/v/ossp/cvs/ossp-pkg/rc/rc_script.c,v' 2>/dev/null --- rc_script.c 2003/07/07 13:30:51 1.35 +++ rc_script.c 2003/07/11 08:49:36 1.36 @@ -178,7 +178,7 @@ int nSubstrings = 0; int *pnVec = NULL; const char *kszErr = NULL; - const int kiRegopt = PCRE_DOTALL | PCRE_MULTILINE; + const int kiRegopt = PCRE_DOTALL | PCRE_DOLLAR_ENDONLY; /* const int kiRegopt = PCRE_DOTALL | PCRE_MULTILINE | PCRE_UNGREEDY;*/ pcre *pRegex = NULL; /* Perl Compatible Regular Expression */