Module Name: othersrc
Committed By: agc
Date: Mon May 30 03:48:36 UTC 2011
Modified Files:
othersrc/external/bsd/gensetlist: gensetlist.c
Log Message:
rename the "subman" regexp to "sub" as it's used in other multiword defs,
not just those for MAN=
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/gensetlist/gensetlist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/gensetlist/gensetlist.c
diff -u othersrc/external/bsd/gensetlist/gensetlist.c:1.6 othersrc/external/bsd/gensetlist/gensetlist.c:1.7
--- othersrc/external/bsd/gensetlist/gensetlist.c:1.6 Thu May 19 16:48:16 2011
+++ othersrc/external/bsd/gensetlist/gensetlist.c Mon May 30 03:48:36 2011
@@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
-#define SETLIST_VERSION "20110513"
+#define SETLIST_VERSION "20110522"
enum {
MAX_DEFS = 64,
@@ -118,7 +118,7 @@
static regex_t bindir;
static regex_t libdir;
static regex_t mandir;
- static regex_t subman;
+ static regex_t sub;
static regex_t mlinks;
static regex_t shlib;
static regex_t incs;
@@ -141,10 +141,8 @@
REG_EXTENDED);
(void) regcomp(&scripts, "^[ \t]*SCRIPTS[ \t]*=",
REG_EXTENDED);
- (void) regcomp(&man, "^[ \t]*MAN[ \t]*=",
- REG_EXTENDED);
- (void) regcomp(&subman, "^[ \t]*([^ \t]+)",
- REG_EXTENDED);
+ (void) regcomp(&man, "^[ \t]*MAN[ \t]*=", REG_EXTENDED);
+ (void) regcomp(&sub, "^[ \t]*([^ \t]+)", REG_EXTENDED);
(void) regcomp(&prog, "^[ \t]*PROG[ \t]*=[ \t]*([^ \t]+)",
REG_EXTENDED);
(void) regcomp(&bindir, "^[ \t]*BINDIR[ \t]*=[ \t]*([^ \t]+)",
@@ -180,7 +178,7 @@
}
if (regexec(&man, in, 10, matches, 0) == 0) {
for (cp = &in[(int)matches[0].rm_eo] ;
- regexec(&subman, cp, 10, matches, 0) == 0 ;
+ regexec(&sub, cp, 10, matches, 0) == 0 ;
cp += matches[0].rm_eo) {
(void) asprintf(&vars->mans[vars->manc++],
"%.*s",
@@ -230,7 +228,7 @@
}
if (regexec(&incs, in, 10, matches, 0) == 0) {
for (cp = &in[(int)matches[0].rm_eo] ;
- regexec(&subman, cp, 10, matches, 0) == 0 ;
+ regexec(&sub, cp, 10, matches, 0) == 0 ;
cp += matches[0].rm_eo) {
(void) asprintf(&vars->incs[vars->incc++],
"%.*s",
