On Thu, Sep 04, 2014 at 09:31:25PM +0000, Sean Bruno wrote: > Author: sbruno > Date: Thu Sep 4 21:31:25 2014 > New Revision: 271141 > URL: http://svnweb.freebsd.org/changeset/base/271141 > > Log: > Allow multiple image activators to run on the same execution by changing > imgp->interpreted to a bitmask instead of, functionally, a bool. Each > imgactivator now requires its own flag in interpreted to indicate whether > or not it has already examined argv[0]. > > Change imgp->interpreted to an unsigned char to add one extra bit for > future use. > > With this change, one can execute a shell script from a 64bit host native > make and still get the binmisc image activator to fire for the script > interpreter. Prior to this, execution would fail. > > Phabric: https://reviews.freebsd.org/D696 > Reviewed by: jhb@ > MFC after: 4 weeks > > Modified: > head/sys/kern/imgact_binmisc.c > head/sys/kern/imgact_shell.c > head/sys/sys/imgact.h > > Modified: head/sys/kern/imgact_binmisc.c > ============================================================================== > --- head/sys/kern/imgact_binmisc.c Thu Sep 4 21:28:25 2014 > (r271140) > +++ head/sys/kern/imgact_binmisc.c Thu Sep 4 21:31:25 2014 > (r271141) > @@ -600,12 +600,12 @@ imgact_binmisc_exec(struct image_params > } > > /* No interpreter nesting allowed. */ > - if (imgp->interpreted) { > + if (imgp->interpreted & IMGACT_BINMISC) { > mtx_unlock(&interp_list_mtx); > return (ENOEXEC); > } >
Unrealated, but I have to ask: can't this be converted to an rmlock? -- Mateusz Guzik <mjguzik gmail.com> _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
