Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 12:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Change @PATH to @DIR for clarity. Add @FILENAME. Addresses #869.

Browse source 
@DIR expands to directory path of the script, @FILENAME expands to just
the script file name without path.
This commit is contained in:
Jon Siwek 2013-06-05 11:01:11 -05:00
parent 7e8b504305
commit 022ce2505f
7 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/scan.l
View file

@ -346,7 +346,7 @@ when return TOK_WHEN;
@DEBUG return TOK_DEBUG; // marks input for debugger @DEBUG return TOK_DEBUG; // marks input for debugger
@PATH { @DIR {
string rval = current_scanned_file_path; string rval = current_scanned_file_path;
if ( ! rval.empty() && rval[0] == '.' ) if ( ! rval.empty() && rval[0] == '.' )
@ -354,7 +354,7 @@ when return TOK_WHEN;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
if ( ! getcwd(path, MAXPATHLEN) ) if ( ! getcwd(path, MAXPATHLEN) )
reporter->Error("getcwd failed: %s", strerror(errno)); reporter->InternalError("getcwd failed: %s", strerror(errno));
else else
rval = string(path) + "/" + rval; rval = string(path) + "/" + rval;
} }
@ -362,6 +362,18 @@ when return TOK_WHEN;
RET_CONST(new StringVal(rval.c_str())); RET_CONST(new StringVal(rval.c_str()));
} }
@FILENAME {
char* filename_copy = copy_string(::filename);
const char* bname = basename(filename_copy);
if ( ! bname )
reporter->InternalError("basename failed: %s", strerror(errno));
StringVal* rval = new StringVal(bname);
delete [] filename_copy;
RET_CONST(rval);
}
@load{WS}{FILE} { @load{WS}{FILE} {
const char* new_file = skip_whitespace(yytext + 5); // Skip "@load". const char* new_file = skip_whitespace(yytext + 5); // Skip "@load".
if ( generate_documentation ) if ( generate_documentation )

1
testing/btest/Baseline/language.at-dir/out Normal file
View file

@ -0,0 +1 @@
/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-dir

0
testing/btest/Baseline/language.at-path/out2 → testing/btest/Baseline/language.at-dir/out2
View file

1
testing/btest/Baseline/language.at-filename/out Normal file
View file

@ -0,0 +1 @@
at-filename.bro

1
testing/btest/Baseline/language.at-path/out
View file

@ -1 +0,0 @@
/Users/jsiwek/Projects/bro/bro/testing/btest/.tmp/language.at-path

4
testing/btest/language/at-path.bro → testing/btest/language/at-dir.bro
View file

@ -3,8 +3,8 @@
# @TEST-EXEC: bro -b ./pathtest.bro >out2 # @TEST-EXEC: bro -b ./pathtest.bro >out2
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out2 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out2
print @PATH; print @DIR;
@TEST-START-FILE pathtest.bro @TEST-START-FILE pathtest.bro
print @PATH; print @DIR;
@TEST-END-FILE @TEST-END-FILE

4
testing/btest/language/at-filename.bro Normal file
View file

@ -0,0 +1,4 @@
# @TEST-EXEC: bro -b %INPUT >out
# @TEST-EXEC: btest-diff out
print @FILENAME;