[w3m-dev 03379] setuid w3mimgdisplay and check console tty
* XMakefile: w3mimgdisplay install by INSTALL_W3MIMGDISPLAY * configure: ask setuid w3mimgdisplay (w3mimgdisplay_setuid): added (INSTALL_W3MIMGDISPLAY): added * etc.c (mySystem): close until FOPEN_MAX * image.c (openImgdisplay): setenv W3M_TTY stderr to /dev/null close until FOPEN_MAX * install-sh: -o, -g for owner, group * proto.h (ttyname_tty): added * search.c (open_migemo): stderr to /dev/null close until FOPEN_MAX * terms.c (ttyname_tty): added * w3mimgdisplay.c: include <sys/types.h>, <unistd.h> W3MIMGDISPLAY_SETUID stderr to /dev/null * w3mimg/w3mimg.c: include <sys/types.h>, <unistd.h> W3MIMGDISPLAY_SETUID * w3mimg/fb/fb_w3mimg.c (check_tty_console): added From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
12
image.c
12
image.c
@@ -1,4 +1,4 @@
|
||||
/* $Id: image.c,v 1.13 2002/11/06 03:19:31 ukai Exp $ */
|
||||
/* $Id: image.c,v 1.14 2002/11/06 03:50:49 ukai Exp $ */
|
||||
|
||||
#include "fm.h"
|
||||
#include <sys/types.h>
|
||||
@@ -107,8 +107,10 @@ openImgdisplay()
|
||||
goto err2;
|
||||
if (Imgdisplay_pid == 0) {
|
||||
/* child */
|
||||
int i;
|
||||
reset_signals();
|
||||
signal(SIGINT, SIG_IGN);
|
||||
set_environ("W3M_TTY", ttyname_tty());
|
||||
#ifdef HAVE_SETPGRP
|
||||
SETPGRP();
|
||||
#endif
|
||||
@@ -117,7 +119,13 @@ openImgdisplay()
|
||||
close(fdw[1]);
|
||||
dup2(fdw[0], 0);
|
||||
dup2(fdr[1], 1);
|
||||
close(2);
|
||||
dup2(open("/dev/null", O_WRONLY), 2);
|
||||
#ifndef FOPEN_MAX
|
||||
#define FOPEN_MAX 1024 /* XXX */
|
||||
#endif
|
||||
/* close all other file descriptors (socket, ...) */
|
||||
for (i = 3; i < FOPEN_MAX; i++)
|
||||
close(i);
|
||||
if (!strchr(Imgdisplay, '/'))
|
||||
cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user