Commit: 2214b4c99172f53d28644307bf475bb541a52d5f
Parent: 379afe935c0c4c8873748ca522b336eabd553cce
Author: opask
Date: Sat, 28 Jul 2018 17:58:56 -0600
cleanup some empty functions
Diffstat:
5 files changed, 12 insertions(+), 71 deletions(-)
diff --git a/kbd.c b/kbd.c
@@ -129,26 +129,20 @@ unsigned char term_seq_tw_mouse[] = "\033[?9l";
static void send_init_sequence(int h, int flags)
{
- want_draw();
hard_write(h, init_seq, (int)strlen(cast_const_char init_seq));
- if (flags & USE_TWIN_MOUSE) {
+ if (flags & USE_TWIN_MOUSE)
hard_write(h, init_seq_tw_mouse, (int)strlen(cast_const_char init_seq_tw_mouse));
- } else {
+ else
hard_write(h, init_seq_x_mouse, (int)strlen(cast_const_char init_seq_x_mouse));
- }
- done_draw();
}
static void send_term_sequence(int h, int flags)
{
- want_draw();
hard_write(h, term_seq, (int)strlen(cast_const_char term_seq));
- if (flags & USE_TWIN_MOUSE) {
+ if (flags & USE_TWIN_MOUSE)
hard_write(h, term_seq_tw_mouse, (int)strlen(cast_const_char term_seq_tw_mouse));
- } else {
+ else
hard_write(h, term_seq_x_mouse, (int)strlen(cast_const_char term_seq_x_mouse));
- }
- done_draw();
}
static void resize_terminal(void)
@@ -469,18 +463,12 @@ static void in_sock(void *itrm_)
qwerty:
for (i = 0; i < c; i++) if (!buf[i]) goto ex;
- if (!is_blocked()) {
- want_draw();
+ if (!is_blocked())
hard_write(itrm->std_out, buf, c);
- done_draw();
- }
goto ret;
ex:
- if (!is_blocked()) {
- want_draw();
+ if (!is_blocked())
hard_write(itrm->std_out, buf, i);
- done_draw();
- }
i++;
memmove(buf, buf + i, c - i);
c -= i;
diff --git a/links.h b/links.h
@@ -369,15 +369,10 @@ int c_accept(int, struct sockaddr *, socklen_t *);
int c_open(unsigned char *, int);
int c_open3(unsigned char *, int, int);
DIR *c_opendir(unsigned char *);
-int get_input_handle(void);
-int get_output_handle(void);
-int get_ctl_handle(void);
#ifdef OS_SETRAW
int setraw(int ctl, int save);
void setcooked(int ctl);
#endif
-void want_draw(void);
-void done_draw(void);
void save_gpm_signals(void);
void restore_gpm_signals(void);
void add_gpm_version(unsigned char **s, int *l);
@@ -398,7 +393,6 @@ void do_signal(int sig, void (*handler)(int));
uttime get_time(void);
uttime get_absolute_time(void);
void ignore_signals(void);
-void init_os(void);
void get_path_to_exe(void);
int os_get_system_name(unsigned char *buffer);
unsigned char *os_conv_to_external_path(unsigned char *, unsigned char *);
diff --git a/main.c b/main.c
@@ -275,9 +275,7 @@ static off_t dump_pos;
static void end_dump(struct object_request *r, void *p)
{
struct cache_entry *ce;
- int oh;
if (!r->state || (r->state == 1 && dmp != D_SOURCE)) return;
- if ((oh = get_output_handle()) == -1) return;
ce = r->ce;
if (dmp == D_SOURCE) {
if (ce) {
@@ -290,7 +288,7 @@ static void end_dump(struct object_request *r, void *p)
l = frag->length - (dump_pos - frag->offset);
if (l >= MAXINT)
l = MAXINT;
- w = hard_write(oh, frag->data + dump_pos - frag->offset, (int)l);
+ w = hard_write(1, frag->data + dump_pos - frag->offset, (int)l);
if (w != l) {
detach_object_connection(r, dump_pos);
if (w < 0)
@@ -327,7 +325,7 @@ static void end_dump(struct object_request *r, void *p)
o.assume_cp = get_commandline_charset();
}
if (!(fd->f_data = cached_format_html(fd, r, r->url, &o, NULL, 0))) goto term_1;
- dump_to_file(fd->f_data, oh);
+ dump_to_file(fd->f_data, 1);
term_1:
reinit_f_data_c(fd);
free(fd);
@@ -429,7 +427,7 @@ static void init(void)
initialize_all_subsystems_2();
info = create_session_info(base_session, u, default_target, &len);
if (!F) {
- if (attach_terminal(get_input_handle(), get_output_handle(), get_ctl_handle(), info, len) < 0)
+ if (attach_terminal(0, 1, 0, info, len) < 0)
fatal_exit("Could not open initial session");
}
#ifdef G
@@ -530,8 +528,6 @@ main(int argc, char *argv[])
g_argc = argc;
g_argv = (unsigned char **)argv;
- init_os();
-
get_path_to_exe();
select_loop(init);
diff --git a/os_dep.c b/os_dep.c
@@ -7,10 +7,6 @@
#include <sys/ioctl.h>
-void init_os(void)
-{
-}
-
int is_safe_in_shell(unsigned char c)
{
return c == '@' || c == '+' || c == '-' || c == '.' || c == ',' || c == '=' || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z');
@@ -172,9 +168,6 @@ int get_terminal_size(int fd, int *x, int *y)
return 0;
}
-#define fd_lock() do { } while (0)
-#define fd_unlock() do { } while (0)
-
static void new_fd_cloexec(int fd)
{
int rs;
@@ -203,74 +196,60 @@ void set_nonblock(int fd)
int c_pipe(int *fd)
{
int r;
- fd_lock();
EINTRLOOP(r, pipe(fd));
if (!r) new_fd_bin(fd[0]), new_fd_bin(fd[1]);
- fd_unlock();
return r;
}
int c_dup(int oh)
{
int h;
- fd_lock();
EINTRLOOP(h, dup(oh));
if (h != -1) new_fd_cloexec(h);
- fd_unlock();
return h;
}
int c_socket(int d, int t, int p)
{
int h;
- fd_lock();
EINTRLOOP(h, socket(d, t, p));
if (h != -1) new_fd_cloexec(h);
- fd_unlock();
return h;
}
int c_accept(int h, struct sockaddr *addr, socklen_t *addrlen)
{
int rh;
- fd_lock();
EINTRLOOP(rh, accept(h, addr, addrlen));
if (rh != -1) new_fd_cloexec(rh);
- fd_unlock();
return rh;
}
int c_open(unsigned char *path, int flags)
{
int h;
- fd_lock();
EINTRLOOP(h, open(cast_const_char path, flags));
if (h != -1) new_fd_bin(h);
- fd_unlock();
return h;
}
int c_open3(unsigned char *path, int flags, int mode)
{
int h;
- fd_lock();
EINTRLOOP(h, open(cast_const_char path, flags, mode));
if (h != -1) new_fd_bin(h);
- fd_unlock();
return h;
}
DIR *c_opendir(unsigned char *path)
{
DIR *d;
- fd_lock();
ENULLLOOP(d, opendir(cast_const_char path));
if (d) {
int h;
EINTRLOOP(h, dirfd(d));
if (h != -1) new_fd_cloexec(h);
}
- fd_unlock();
return d;
}
@@ -337,6 +316,7 @@ void get_path_to_exe(void)
path_to_exe = g_argv[0];
}
+
unsigned char *os_conv_to_external_path(unsigned char *file, unsigned char *prog)
{
return stracpy(file);
@@ -447,18 +427,6 @@ int start_thread(void (*fn)(void *, int), void *ptr, int l, int counted)
return p[0];
}
-void want_draw(void) {}
-void done_draw(void) {}
-
-int get_output_handle(void) { return 1; }
-
-int get_ctl_handle(void) { return 0; }
-
-int get_input_handle(void)
-{
- return 0;
-}
-
static void exec_new_links(struct terminal *term, unsigned char *xterm, unsigned char *exe, unsigned char *param)
{
unsigned char *str;
diff --git a/terminal.c b/terminal.c
@@ -167,11 +167,8 @@ static void redraw_terminal_all(struct terminal *term)
static void erase_screen(struct terminal *term)
{
- if (!term->master || !is_blocked()) {
- if (term->master) want_draw();
+ if (!term->master || !is_blocked())
hard_write(term->fdout, cast_uchar "\033[2J\033[1;1H", 10);
- if (term->master) done_draw();
- }
}
static void redraw_terminal_cls(struct terminal *term)
@@ -596,7 +593,7 @@ struct terminal *init_term(int fdin, int fdout, void (*root_window)(struct windo
term->count = terminal_count++;
term->fdin = fdin;
term->fdout = fdout;
- term->master = term->fdout == get_output_handle();
+ term->master = term->fdout == 1;
term->lcx = -1;
term->lcy = -1;
term->dirty = 1;
@@ -1057,9 +1054,7 @@ static void redraw_screen(struct terminal *term)
add_num_to_str(&a, &l, term->cx + 1 + term->left_margin);
add_to_str(&a, &l, cast_uchar "H");
}
- if (l && term->master) want_draw();
hard_write(term->fdout, a, l);
- if (l && term->master) done_draw();
free(a);
term->dirty = 0;
}