dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add wildcard support to menuconfig (again)

Browse Source 
SVN-Revision: 3768
v19.07.3_mercusys_ac12_duma
Mike Baker 18 years ago
parent 2f7773adbc
commit 95c9400750
2 changed files with 86 additions and 44 deletions
Show Stats Download Patch File Download Diff File

65
openwrt/scripts/config/lex.zconf.c_shipped
Unescape Escape View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <glob.h>
/* end standard C headers. */ /* end standard C headers. */
@ -2259,32 +2260,52 @@ void zconf_initscan(const char *name)
void zconf_nextfile(const char *name) void zconf_nextfile(const char *name)
{ {
struct file *file = file_lookup(name); size_t i;
struct buffer *buf = malloc(sizeof(*buf)); int retval;
memset(buf, 0, sizeof(*buf)); glob_t files;
char *filename;
current_buf->state = YY_CURRENT_BUFFER; struct file *file;
zconfin = zconf_fopen(name); struct buffer *buf;
if (!zconfin) {
printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files);
if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED || retval == GLOB_NOMATCH) {
printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match",
name);
exit(1); exit(1);
} }
zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
buf->parent = current_buf;
current_buf = buf;
if (file->flags & FILE_BUSY) { for (i = files.gl_pathc-1; i != (size_t)-1; --i) {
printf("recursive scan (%s)?\n", name); filename = files.gl_pathv[i];
exit(1);
} file = file_lookup(filename);
if (file->flags & FILE_SCANNED) { buf = malloc(sizeof(*buf));
printf("file %s already scanned?\n", name); memset(buf, 0, sizeof(*buf));
exit(1); current_buf->state = YY_CURRENT_BUFFER;
zconfin = zconf_fopen(filename);
if (!zconfin) {
printf("%s:%d: can't open file \"%s\"\n",
zconf_curname(), zconf_lineno(), filename);
exit(1);
}
zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
buf->parent = current_buf;
current_buf = buf;
if (file->flags & FILE_BUSY) {
printf("recursive scan (%s)?\n", filename);
exit(1);
}
if (file->flags & FILE_SCANNED) {
printf("file %s already scanned?\n", filename);
exit(1);
}
file->flags |= FILE_BUSY;
file->lineno = 1;
file->parent = current_file;
current_file = file;
} }
file->flags |= FILE_BUSY;
file->lineno = 1;
file->parent = current_file;
current_file = file;
} }
static void zconf_endfile(void) static void zconf_endfile(void)

65
openwrt/scripts/config/zconf.l
Unescape Escape View File

@ -12,6 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <glob.h>
#define LKC_DIRECT_LINK #define LKC_DIRECT_LINK
#include "lkc.h" #include "lkc.h"
@ -293,32 +294,52 @@ void zconf_initscan(const char *name)
void zconf_nextfile(const char *name) void zconf_nextfile(const char *name)
{ {
struct file *file = file_lookup(name); size_t i;
struct buffer *buf = malloc(sizeof(*buf)); int retval;
memset(buf, 0, sizeof(*buf)); glob_t files;
char *filename;
current_buf->state = YY_CURRENT_BUFFER; struct file *file;
yyin = zconf_fopen(name); struct buffer *buf;
if (!yyin) {
printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name); retval = glob(name, GLOB_ERR | GLOB_MARK, NULL, &files);
if (retval == GLOB_NOSPACE || retval == GLOB_ABORTED || retval == GLOB_NOMATCH) {
printf("%s:%d: glob failed: %s \"%s\"\n", zconf_curname(), zconf_lineno(),
retval == GLOB_NOSPACE ? "failed to allocate memory" :
retval == GLOB_ABORTED ? "read error" : "no match",
name);
exit(1); exit(1);
} }
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
buf->parent = current_buf;
current_buf = buf;
if (file->flags & FILE_BUSY) { for (i = files.gl_pathc-1; i != (size_t)-1; --i) {
printf("recursive scan (%s)?\n", name); filename = files.gl_pathv[i];
exit(1);
} file = file_lookup(filename);
if (file->flags & FILE_SCANNED) { buf = malloc(sizeof(*buf));
printf("file %s already scanned?\n", name); memset(buf, 0, sizeof(*buf));
exit(1); current_buf->state = YY_CURRENT_BUFFER;
zconfin = zconf_fopen(filename);
if (!zconfin) {
printf("%s:%d: can't open file \"%s\"\n",
zconf_curname(), zconf_lineno(), filename);
exit(1);
}
zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
buf->parent = current_buf;
current_buf = buf;
if (file->flags & FILE_BUSY) {
printf("recursive scan (%s)?\n", filename);
exit(1);
}
if (file->flags & FILE_SCANNED) {
printf("file %s already scanned?\n", filename);
exit(1);
}
file->flags |= FILE_BUSY;
file->lineno = 1;
file->parent = current_file;
current_file = file;
} }
file->flags |= FILE_BUSY;
file->lineno = 1;
file->parent = current_file;
current_file = file;
} }
static void zconf_endfile(void) static void zconf_endfile(void)

Write Preview
Loading…
Cancel
Save