d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the previous warning a different way since the emul_path exposure was

Browse Source 
intentional.  Avoid the warning by propagating the const filename through
to elf_load_file() instead.
This commit is contained in:
Peter Wemm 1999-07-09 19:10:14 +00:00
parent c6bb4a64b8
commit bdbc8c265e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/imgact_elf.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: imgact_elf.c,v 1.59 1999/07/05 18:38:29 marcel Exp $
* $Id: imgact_elf.c,v 1.60 1999/07/09 18:05:03 peter Exp $
*/
#include "opt_rlimit.h"
@ -72,7 +72,7 @@ __ElfType(Auxargs);
static int elf_check_header __P((const Elf_Ehdr *hdr));
static int elf_freebsd_fixup __P((long **stack_base,
struct image_params *imgp));
static int elf_load_file __P((struct proc *p, char *file, u_long *addr,
static int elf_load_file __P((struct proc *p, const char *file, u_long *addr,
u_long *entry));
static int elf_load_section __P((struct proc *p,
struct vmspace *vmspace, struct vnode *vp,
@ -297,7 +297,7 @@ elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_o
* the entry point for the loaded file.
*/
static int
elf_load_file(struct proc *p, char *file, u_long *addr, u_long *entry)
elf_load_file(struct proc *p, const char *file, u_long *addr, u_long *entry)
{
const Elf_Ehdr *hdr = NULL;
const Elf_Phdr *phdr = NULL;
@ -588,11 +588,9 @@ exec_elf_imgact(struct image_params *imgp)
brand_info->emul_path, interp);
if ((error = elf_load_file(imgp->proc, path, &addr,
&imgp->entry_addr)) != 0) {
snprintf(path, sizeof(path), "%s", interp);
if ((error = elf_load_file(imgp->proc, path, &addr,
if ((error = elf_load_file(imgp->proc, interp, &addr,
&imgp->entry_addr)) != 0) {
uprintf("ELF interpreter %s not found\n",
path);
uprintf("ELF interpreter %s not found\n", path);
goto fail;
}
}