diff options
author | Karl Berry <karl@freefriends.org> | 2009-02-26 19:44:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-02-26 19:44:17 +0000 |
commit | fd209ee79002d0d87c3835c8e2697ed0eb7cc53c (patch) | |
tree | 4e2d10d678beb337d03b525d939068b6ebb55b24 /Build/source/texk/web2c/alephdir | |
parent | 6226ce8e1a87017d3c958d63660c83b669e4da9a (diff) |
new restricted mode for \write18
git-svn-id: svn://tug.org/texlive/trunk@12244 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/alephdir')
-rw-r--r-- | Build/source/texk/web2c/alephdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/alephdir/com16bit-rc2.ch | 41 | ||||
-rw-r--r-- | Build/source/texk/web2c/alephdir/comsrcspec.ch | 20 |
3 files changed, 44 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog index f6ba3e512f3..882b5323501 100644 --- a/Build/source/texk/web2c/alephdir/ChangeLog +++ b/Build/source/texk/web2c/alephdir/ChangeLog @@ -1,3 +1,9 @@ +2009-02-26 Karl Berry <karl@tug.org> + + * comsrcspec.ch, com16bit-rc2.ch: + Use runsystem() instead of system(), etc. See tex.ch entry in + ../ChangeLog + 2008-03-23 Karl Berry <karl@freefriends.org> * Update to TeX 3.1415926; compile in pool files. diff --git a/Build/source/texk/web2c/alephdir/com16bit-rc2.ch b/Build/source/texk/web2c/alephdir/com16bit-rc2.ch index 2b5c63d0923..d8f80265e7d 100644 --- a/Build/source/texk/web2c/alephdir/com16bit-rc2.ch +++ b/Build/source/texk/web2c/alephdir/com16bit-rc2.ch @@ -1008,7 +1008,7 @@ if_eof_code: begin scan_four_bit_int; b:=(read_open[cur_val]=closed); end; @y if_eof_code: begin scan_four_bit_int_or_18; - if cur_val=18 then b:=not shell_enabled_p + if cur_val=18 then b:=not shellenabledp else b:=(read_open[cur_val]=closed); end; @z @@ -2361,7 +2361,7 @@ print(" (format="); print(job_name); print_char(" "); @d setup_bound_var(#)==bound_default:=#; setup_bound_var_end @d setup_bound_var_end(#)==bound_name:=#; setup_bound_var_end_end @d setup_bound_var_end_end(#)== - setup_bound_variable(address_of(#), bound_name, bound_default); + setup_bound_variable(addressof(#), bound_name, bound_default); @p procedure main_body; begin @!{|start_here|} @@ -2581,6 +2581,7 @@ begin @<Expand macros in the token list @y @!d:integer; {number of characters in incomplete current string} @!clobbered:boolean; {system string is ok?} +@!runsystem_ret:integer; {return value from |runsystem|} begin @<Expand macros in the token list @z @@ -2603,34 +2604,39 @@ if j=18 then {If the log file isn't open yet, we can only send output to the terminal. Calling |open_log_file| from here seems to result in bad data in the log.} if not log_opened then selector:=term_only; - print_nl("system("); + print_nl("runsystem("); for d:=0 to cur_length-1 do begin {|print| gives up if passed |str_ptr|, so do it by hand.} print(so(str_pool[str_start(str_ptr)+d])); {N.B.: not |print_char|} end; print(")..."); - if shell_enabled_p then - begin str_room(1); append_char(0); {Append a null byte to the expansion.} + if shellenabledp then begin + str_room(1); append_char(0); {Append a null byte to the expansion.} clobbered:=false; for d:=0 to cur_length-1 do {Convert to external character set.} - begin str_pool[str_start(str_ptr)+d]:=xchr[str_pool[str_start(str_ptr)+d]]; - if (str_pool[str_start(str_ptr)+d]=null_code) - and (d<cur_length-1) then clobbered:=true; + begin + str_pool[str_start(str_ptr)+d]:=xchr[str_pool[str_start(str_ptr)+d]]; + if (str_pool[str_start(str_ptr)+d]=null_code) + and (d<cur_length-1) then clobbered:=true; {minimal checking: NUL not allowed in argument string of |system|()} end; if clobbered then print("clobbered") - else begin {We have the string; run system(3). We don't have anything - reasonable to do with the return status, unfortunately discard it.} + else begin {We have the command. See if we're allowed to execute it, + and report in the log. We don't check the actual exit status of + the command, or do anything with the output.} for d:=0 to cur_length-1 do {Convert to external character set.} begin outside_string_array[d]:=xchr[str_pool[str_start(str_ptr)+d]]; end; outside_string_array[cur_length]:=null_code; - system(outside_string_array); - print("executed"); - end; - end - else begin print("disabled"); + runsystem_ret := runsystem(outside_string_array); + if runsystem_ret = -1 then print("quotation error in system command") + else if runsystem_ret = 0 then print("disabled (restricted)") + else if runsystem_ret = 1 then print("executed") + else if runsystem_ret = 2 then print("executed (allowed)") + end; + end else begin + print("disabled"); {|shellenabledp| false} end; print_char("."); print_nl(""); print_ln; pool_ptr:=str_start(str_ptr); {erase the string} @@ -2682,7 +2688,7 @@ system-dependent section allows easy integration of Web2c and e-\TeX, etc.) @<Glob...@>= @!edit_name_start: pool_pointer; {where the filename to switch to starts} @!edit_name_length,@!edit_line: integer; {what line to start editing at} -@!ipc_on: c_int_type; {level of IPC action, 0 for none [default]} +@!ipc_on: cinttype; {level of IPC action, 0 for none [default]} @!stop_at_space: boolean; {whether |more_name| returns false for space} @ The |edit_name_start| will be set to point into |str_pool| somewhere after @@ -2698,7 +2704,8 @@ strings. @<Global...@> = @!save_str_ptr: str_number; @!save_pool_ptr: pool_pointer; -@!shell_enabled_p: c_int_type; +@!shellenabledp: cinttype; +@!restrictedshell: cinttype; @!output_comment: ^char; @!k,l: 0..65535; {used by `Make the first 256 strings', etc.} diff --git a/Build/source/texk/web2c/alephdir/comsrcspec.ch b/Build/source/texk/web2c/alephdir/comsrcspec.ch index 1a4999b3878..97583491f57 100644 --- a/Build/source/texk/web2c/alephdir/comsrcspec.ch +++ b/Build/source/texk/web2c/alephdir/comsrcspec.ch @@ -7,8 +7,8 @@ @!special_loc:pointer; @!special_token:halfword; -@!parse_first_line_p:c_int_type; {parse the first line for options} -@!file_line_error_style_p:c_int_type; {format messages as file:line:error} +@!parse_first_line_p:cinttype; {parse the first line for options} +@!file_line_error_style_p:cinttype; {format messages as file:line:error} @!halt_on_error_p:boolean; {allow only on error.} @!src_specials_p : boolean; @@ -35,8 +35,12 @@ else wterm(version_string); if format_ident>0 then slow_print(format_ident); print_ln; -if shell_enabled_p then begin - wterm_ln(' \write18 enabled.') +if shellenabledp then begin + wterm(' '); + if restrictedshell then begin + wterm('restricted '); + end; + wterm_ln('\write18 enabled.'); end; if src_specials_p then begin wterm_ln(' Source specials enabled.') @@ -96,10 +100,14 @@ then else wlog(eTeX_banner); wlog(version_string); -if shell_enabled_p then begin +if shellenabledp then begin wlog_cr; + wlog(' '); + if restrictedshell then begin + wlog('restricted '); + end; wlog('\write18 enabled.') -end; + end; if src_specials_p then begin wlog_cr; wlog(' Source specials enabled.') |