From 5aacb824a4ef3cea1575b93190bd4918ebe3d728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski=20=28amade=29?= Date: Sat, 8 Jan 2011 22:02:34 +0100 Subject: move extern's into one place --- src/acls.c | 5 -- src/ansi.c | 14 ----- src/attacher.c | 14 +---- src/canvas.c | 7 --- src/display.c | 27 -------- src/encoding.c | 9 --- src/extern.h | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/fileio.c | 14 ----- src/help.c | 24 ------- src/input.c | 4 -- src/layer.c | 10 --- src/layout.c | 3 - src/list_display.c | 5 -- src/list_generic.c | 2 - src/list_window.c | 14 ----- src/mark.c | 6 -- src/misc.c | 8 --- src/nethack.c | 5 +- src/process.c | 73 --------------------- src/pty.c | 2 - src/resize.c | 8 --- src/screen.c | 17 ----- src/search.c | 4 -- src/socket.c | 19 ------ src/termcap.c | 15 ----- src/tty.sh | 3 - src/utmp.c | 24 ------- src/viewport.c | 2 - src/window.c | 35 ----------- 29 files changed, 184 insertions(+), 371 deletions(-) diff --git a/src/acls.c b/src/acls.c index 3da315d..82b1bd8 100644 --- a/src/acls.c +++ b/src/acls.c @@ -54,11 +54,6 @@ * user managing code, this does not really belong into the acl stuff * ************************************************************************/ -extern struct comm comms[]; -extern struct win *windows, **wtab; -extern char NullStr[]; -extern char SockPath[]; -extern struct display *display, *displays; struct acluser *users; int maxusercount = 0; /* used in process.c: RC_MONITOR, RC_SILENCE */ diff --git a/src/ansi.c b/src/ansi.c index 6dfdd50..68d20d3 100644 --- a/src/ansi.c +++ b/src/ansi.c @@ -37,20 +37,6 @@ #include "extern.h" #include "logfile.h" -extern struct display *display, *displays; -extern struct win *fore; /* for 83 escape */ -extern struct layer *flayer; /* for 83 escape */ - -extern struct NewWindow nwin_default; /* for ResetWindow() */ -extern int nversion; /* numerical version of screen */ -extern int log_flush, logtstamp_on, logtstamp_after; -extern char *logtstamp_string; -extern char *captionstring; -extern char *hstatusstring; -extern char *wliststr; -extern int compacthist; -extern struct acluser *EffectiveAclUser; - int Z0width, Z1width; /* widths for Z0/Z1 switching */ /* globals set in WriteString */ diff --git a/src/attacher.c b/src/attacher.c index 127a9ce..6615d51 100644 --- a/src/attacher.c +++ b/src/attacher.c @@ -51,19 +51,7 @@ static sigret_t AttacherChld SIGPROTOARG; #endif static sigret_t AttachSigCont SIGPROTOARG; -extern int real_uid, real_gid, eff_uid, eff_gid; -extern char *SockName, *SockMatch, SockPath[]; -extern char HostName[]; -extern struct passwd *ppp; -extern char *attach_tty, *attach_term, *LoginName, *preselect; -extern int xflag, dflag, rflag, quietflag, adaptflag; -extern struct mode attach_Mode; -extern struct NewWindow nwin_options; -extern int MasterPid, attach_fd; - -extern char *multi; -extern int multiattach, multi_uid, own_uid; -extern int tty_mode, tty_oldmode; + # ifndef USE_SETEUID static int multipipe[2]; # endif diff --git a/src/canvas.c b/src/canvas.c index b071a61..6dd72fe 100644 --- a/src/canvas.c +++ b/src/canvas.c @@ -32,13 +32,6 @@ #include "canvas.h" #include "list_generic.h" -extern struct display *display; -extern struct win *fore, *windows; -extern struct layer *flayer; -extern int captionalways; -extern struct LayFuncs BlankLf; -extern int focusminwidth, focusminheight; - static void CanvasInitBlank(struct canvas *cv) { diff --git a/src/display.c b/src/display.c index fb6d723..d22f7fe 100644 --- a/src/display.c +++ b/src/display.c @@ -60,33 +60,6 @@ static void SetBackColor (int); static void RemoveStatusMinWait (void); -extern struct layer *flayer; -extern struct win *windows, *fore; -extern struct LayFuncs WinLf; - -extern int use_hardstatus; -extern int MsgWait, MsgMinWait; -extern int Z0width, Z1width; -extern unsigned char *blank, *null; -extern struct mline mline_blank, mline_null, mline_old; -extern struct mchar mchar_null, mchar_blank, mchar_so; -extern struct NewWindow nwin_default; -extern struct action idleaction; - -/* XXX shouldn't be here */ -extern char *hstatusstring; -extern char *captionstring; - -extern int pastefont; -extern int idletimo; - -extern int pty_preopen; -#if defined(TIOCSWINSZ) || defined(TIOCGWINSZ) -extern struct winsize glwz; -#endif -extern char **NewEnv; -extern int real_uid, real_gid; - /* * tputs needs this to calculate the padding */ diff --git a/src/encoding.c b/src/encoding.c index 6ea456f..cc202ec 100644 --- a/src/encoding.c +++ b/src/encoding.c @@ -27,15 +27,6 @@ #include "screen.h" #include "extern.h" - -extern unsigned char *null; -extern struct display *display, *displays; -extern struct layer *flayer; - -extern char *screenencodings; - -extern int cjkwidth; - static int encmatch (char *, char *); static int recode_char (int, int, int); static int recode_char_to_encoding (int, int); diff --git a/src/extern.h b/src/extern.h index f312707..9b612e9 100644 --- a/src/extern.h +++ b/src/extern.h @@ -441,3 +441,185 @@ extern int EncodeChar (char *, int, int, int *); /* layout.c */ extern void RemoveLayout (struct layout *); extern int LayoutDumpCanvas (struct canvas *, char *); + +/* + * GLOBAL VARIABLES + */ + +extern char screenterm[]; +extern char version[]; +extern char DefaultShell[]; +extern char HostName[]; +extern char NullStr[]; +extern char SockPath[]; +extern char Term[]; +extern char Termcap[]; +extern char *attach_tty; +extern char *attach_term; +extern char *captionstring; +extern char *extra_incap; +extern char *extra_outcap; +extern char *hardcopydir; +extern char *home; +extern char *hstatusstring; +extern char *kmapadef[]; +extern char *kmapdef[]; +extern char *kmapmdef[]; +extern char *logtstamp_string; +extern char *multi; +extern char *noargs[]; +extern char *preselect; +extern char *printcmd; +extern char *rc_name; +extern char *screenencodings; +extern char *screenlogfile; +extern char *timestring; +extern char *wliststr; +extern char *wlisttit; +extern char *zmodem_recvcmd; +extern char *zmodem_sendcmd; +extern char *ActivityString; +extern char *BellString; +extern char *BufferFile; +extern char *LoginName; +extern char *PowDetachString; +extern char *RcFileName; +extern char *ShellArgs[]; +extern char *ShellProg; +extern char *SockMatch; +extern char *SockName; +extern char *VisualBellString; +extern char **environ; +extern char **NewEnv; + +extern unsigned char mark_key_tab[]; +extern unsigned char *blank; +extern unsigned char *null; + +extern int adaptflag; +extern int attach_fd; +extern int attr2color[][4]; +extern int auto_detach; +extern int captionalways; +extern int cjkwidth; +extern int compacthist; +extern int default_startup; +extern int defautonuke; +extern int defmousetrack; +extern int defnonblock; +extern int defobuflimit; +extern int dflag; +extern int eff_gid; +extern int eff_uid; +extern int focusminheight; +extern int focusminwidth; +extern int force_vt; +extern int hardcopy_append; +extern int hardstatusemu; +extern int idletimo; +extern int iflag; +extern int join_with_cr; +extern int kmap_extn; +extern int lsflag; +extern int log_flush; +extern int logtstamp_on; +extern int logtstamp_after; +extern int maxusercount; +extern int maxwin; +extern int multi_uid; +extern int multiattach; +extern int nattr2color; +extern int nversion; +extern int own_uid; +extern int pastefont; +extern int pty_preopen; +extern int search_ic; +extern int separate_sids; +extern int queryflag; +extern int quietflag; +extern int real_gid; +extern int real_uid; +extern int renditions[]; +extern int rflag; +extern int tty_mode; +extern int tty_oldmode; +extern int use_altscreen; +extern int use_hardstatus; +extern int wipeflag; +extern int xflag; +extern int visual_bell; +extern int zmodem_mode; +extern int DefaultEsc; +extern int MasterPid; +extern int MsgMinWait; +extern int MsgWait; +extern int ServerSocket; +extern int SilenceWait; +extern int TtyMode; +extern int VerboseCreate; +extern int VBellWait; +extern int Z0width; +extern int Z1width; +extern int ZombieKey_destroy; +extern int ZombieKey_onerror; +extern int ZombieKey_resurrect; + +extern struct action idleaction; +extern struct action dmtab[]; +extern struct action ktab[]; +extern struct action mmtab[]; +extern struct action umtab[]; +extern struct term term[]; +extern struct acluser *users, *EffectiveAclUser; +extern struct display *display, *displays; +extern struct LayFuncs ListLf; +extern struct LayFuncs MarkLf; +extern struct LayFuncs WinLf; +extern struct LayFuncs BlankLf; +extern struct layout *layout_attach, *layout_last, layout_last_marker; +extern struct layout *layouts; +extern struct layout *laytab[]; +extern struct NewWindow nwin_undef, nwin_default, nwin_options; +extern struct win *fore, **wtab, *console_window, *windows; +extern struct kmap_ext *kmap_exts; +extern int kmap_extn; +extern struct layer *flayer; +extern struct mline mline_blank; +extern struct mline mline_null; +extern struct mline mline_old; +extern struct mchar mchar_so; +extern struct mchar mchar_blank; +extern struct mchar mchar_null; +extern struct comm comms[]; +extern struct event logflushev; +extern struct event serv_read; +extern struct mode attach_Mode; +extern struct passwd *ppp; + + +#ifdef NETHACK +extern int nethackflag; +#endif + +#if defined(TIOCSWINSZ) || defined(TIOCGWINSZ) +extern struct winsize glwz; +#endif + +#ifdef O_NOCTTY +extern int separate_sids; +#endif + +# if defined(GETUTENT) && (!defined(SVR4) || defined(__hpux)) && ! defined(__CYGWIN__) +# if defined(hpux) /* cruel hpux release 8.0 */ +# define pututline _pututline +# endif /* hpux */ +extern struct utmp *getutline(), *pututline(); +# if defined(_SEQUENT_) +extern struct utmp *ut_add_user(), *ut_delete_user(); +extern char *ut_find_host(); +# ifndef UTHOST +# define UTHOST /* _SEQUENT_ has ut_find_host() */ +# endif +# endif /* _SEQUENT_ */ +# endif /* GETUTENT && !SVR4 */ + diff --git a/src/fileio.c b/src/fileio.c index c9c8c2b..12098cf 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -39,18 +39,6 @@ #include "screen.h" #include "extern.h" -extern struct display *display, *displays; -extern struct win *fore; -extern struct layer *flayer; -extern int real_uid, eff_uid; -extern int real_gid, eff_gid; -extern char *extra_incap, *extra_outcap; -extern char *home, *RcFileName; -extern char SockPath[], *SockName; -extern char *BufferFile; -extern int hardcopy_append; -extern char *hardcopydir; - static char *CatExtra (char *, char *); static char *findrcfile (char *); @@ -350,8 +338,6 @@ RcLine(char *ubuf, int ubufl) { char *args[MAXARGS]; int argl[MAXARGS]; - extern struct acluser *EffectiveAclUser; /* acl.c */ - extern struct acluser *users; /* acl.c */ if (display) { diff --git a/src/help.c b/src/help.c index 4e4ff24..e843811 100644 --- a/src/help.c +++ b/src/help.c @@ -40,24 +40,8 @@ char version[60]; /* initialised by main() */ -extern struct layer *flayer; -extern struct display *display, *displays; -extern struct win *windows; -extern int maxwin; -extern char *noargs[]; -extern struct mchar mchar_blank, mchar_so; -extern int renditions[]; -extern unsigned char *blank; -extern struct win **wtab; -extern struct term term[]; - -extern struct LayFuncs ListLf; - static void PadStr (char *, int, int, int); -extern char *wliststr; -extern char *wlisttit; - void exit_with_usage(char *myname, char *message, char *arg) { @@ -109,9 +93,6 @@ exit_with_usage(char *myname, char *message, char *arg) ** Here come the help page routines */ -extern struct comm comms[]; -extern struct action ktab[]; - static void HelpProcess (char **, int *); static void HelpAbort (void); static void HelpRedisplayLine (int, int, int, int); @@ -682,11 +663,6 @@ CopyrightRedisplayLine(int y, int xs, int xe, int isblank) ** */ -extern struct kmap_ext *kmap_exts; -extern int kmap_extn; -extern struct action dmtab[]; -extern struct action mmtab[]; - static void BindkeyProcess (char **, int *); static void BindkeyAbort (void); diff --git a/src/input.c b/src/input.c index 52faaaa..f96434c 100644 --- a/src/input.c +++ b/src/input.c @@ -37,10 +37,6 @@ static void InpProcess (char **, int *); static void InpAbort (void); static void InpRedisplayLine (int, int, int, int); -extern struct layer *flayer; -extern struct display *display; -extern struct mchar mchar_blank, mchar_so; - struct inpline { char buf[MAXSTR+1]; /* text buffer */ diff --git a/src/layer.c b/src/layer.c index e7ecd22..c86bbd6 100644 --- a/src/layer.c +++ b/src/layer.c @@ -33,14 +33,6 @@ #include "mark.h" #include "extern.h" -extern struct display *display, *displays; - -extern struct mline mline_blank, mline_null; -extern struct mchar mchar_blank, mchar_null; - -extern struct layer *flayer; /* sigh */ -extern struct LayFuncs WinLf; -extern struct LayFuncs BlankLf; static struct mline *mloff (struct mline *, int); @@ -951,8 +943,6 @@ InitOverlayPage(int datasize, struct LayFuncs *lf, int block) return 0; } -extern struct layout *layouts; - void ExitOverlayPage() { diff --git a/src/layout.c b/src/layout.c index a05e77b..f23568d 100644 --- a/src/layout.c +++ b/src/layout.c @@ -31,9 +31,6 @@ #include "extern.h" #include "layout.h" -extern struct display *display; -extern int captionalways; - struct layout *layouts; struct layout *laytab[MAXLAY]; struct layout *layout_last, layout_last_marker; diff --git a/src/list_display.c b/src/list_display.c index 496cfa9..e42f045 100644 --- a/src/list_display.c +++ b/src/list_display.c @@ -37,11 +37,6 @@ #include "extern.h" #include "list_generic.h" - -extern struct layer *flayer; -extern struct display *display, *displays; -extern struct mchar mchar_blank, mchar_so; - static char ListID[] = "display"; /* diff --git a/src/list_generic.c b/src/list_generic.c index 89b2cc7..e7b9940 100644 --- a/src/list_generic.c +++ b/src/list_generic.c @@ -28,8 +28,6 @@ /* Deals with a generic list display */ -extern struct layer *flayer; - static void ListProcess (char **, int *); static void ListAbort (void); static void ListRedisplayLine (int, int, int, int); diff --git a/src/list_window.c b/src/list_window.c index ac62387..7fe2e81 100644 --- a/src/list_window.c +++ b/src/list_window.c @@ -33,20 +33,6 @@ #include "extern.h" #include "list_generic.h" -extern struct layer *flayer; -extern struct display *display, *displays; - -extern char *wlisttit; -extern char *wliststr; - -extern struct mchar mchar_blank, mchar_so; -extern int renditions[]; - -extern struct win **wtab, *windows, *fore; -extern int maxwin; - -extern char *noargs[]; - static char ListID[] = "window"; struct gl_Window_Data diff --git a/src/mark.c b/src/mark.c index b5b62ca..1bcfee3 100644 --- a/src/mark.c +++ b/src/mark.c @@ -58,12 +58,6 @@ static void MarkAbort (void); static void MarkRedisplayLine (int, int, int, int); static int MarkRewrite (int, int, int, struct mchar *, int); -extern struct layer *flayer; -extern struct display *display, *displays; -extern struct win *fore; -extern struct mline mline_blank, mline_null; -extern struct mchar mchar_so; - int pastefont = 1; struct LayFuncs MarkLf = diff --git a/src/misc.c b/src/misc.c index 98501be..3521f8a 100644 --- a/src/misc.c +++ b/src/misc.c @@ -38,14 +38,6 @@ # include #endif -extern struct layer *flayer; - -extern int eff_uid, real_uid; -extern int eff_gid, real_gid; -extern struct mline mline_old; -extern struct mchar mchar_blank; -extern unsigned char *null, *blank; - #ifdef HAVE_FDWALK static int close_func (void *, int); #endif diff --git a/src/nethack.c b/src/nethack.c index 74d9194..36725df 100644 --- a/src/nethack.c +++ b/src/nethack.c @@ -28,10 +28,7 @@ #include "config.h" #include "screen.h" - -#ifdef NETHACK -extern int nethackflag; -#endif +#include "extern.h" struct nlstrans { char *from; diff --git a/src/process.c b/src/process.c index 4f28003..f028f0f 100644 --- a/src/process.c +++ b/src/process.c @@ -56,55 +56,6 @@ #include "viewport.h" #include "list_generic.h" -extern struct comm comms[]; -extern char *rc_name; -extern char *RcFileName, *home; -extern char *BellString, *ActivityString, *ShellProg, *ShellArgs[]; -extern char *hstatusstring, *captionstring, *timestring; -extern char *wliststr, *wlisttit; -extern int captionalways; -extern int queryflag; -extern char *hardcopydir, *screenlogfile, *logtstamp_string; -extern int log_flush, logtstamp_on, logtstamp_after; -extern char *VisualBellString; -extern int VBellWait, MsgWait, MsgMinWait, SilenceWait; -extern char SockPath[], *SockName; -extern int TtyMode, auto_detach, use_altscreen; -extern int iflag, maxwin; -extern int focusminwidth, focusminheight; -extern int use_hardstatus, visual_bell; -extern int attr2color[][4]; -extern int nattr2color; -extern int hardstatusemu; -extern char *printcmd; -extern int default_startup; -extern int defobuflimit; -extern int defnonblock; -extern int defmousetrack; -extern int ZombieKey_destroy; -extern int ZombieKey_resurrect; -extern int ZombieKey_onerror; -extern int defautonuke; -extern int separate_sids; -extern struct NewWindow nwin_default, nwin_undef; -extern int join_with_cr; -extern int compacthist; -extern int search_ic; -extern int pastefont; -extern unsigned char mark_key_tab[]; -extern char *BufferFile; -extern char *BufferFile, *PowDetachString; -extern struct acluser *EffectiveAclUser; /* acl.c */ -extern struct term term[]; /* terminal capabilities */ -extern char *kmapdef[]; -extern char *kmapadef[]; -extern char *kmapmdef[]; -extern struct mchar mchar_so, mchar_null; -extern int renditions[]; -extern int VerboseCreate; -extern char *screenencodings; -extern int cjkwidth; - static int CheckArgNum (int, char **); static void ClearAction (struct action *); static void SaveAction (struct action *, int, char **, int *); @@ -146,30 +97,6 @@ static struct action *FindKtab (char *, int); static void SelectFin (char *, int, char *); static void SelectLayoutFin (char *, int, char *); - -extern struct layer *flayer; -extern struct display *display, *displays; -extern struct win *fore, *console_window, *windows; -extern struct acluser *users; -extern struct layout *layouts, *layout_attach, layout_last_marker; -extern struct layout *laytab[]; - -extern char screenterm[], HostName[], version[]; -extern struct NewWindow nwin_undef, nwin_default; -extern struct LayFuncs WinLf, MarkLf; - -extern int Z0width, Z1width; -extern int real_uid, real_gid; - -#ifdef NETHACK -extern int nethackflag; -#endif - - -extern struct win **wtab; - -extern char *multi; -extern int maxusercount; char NullStr[] = ""; struct plop plop_tab[MAX_PLOP_DEFS]; diff --git a/src/pty.c b/src/pty.c index 3455463..2c90f5e 100644 --- a/src/pty.c +++ b/src/pty.c @@ -74,8 +74,6 @@ # undef HAVE_SVR4_PTYS #endif -extern int eff_uid; - /* used for opening a new pty-pair: */ static char PtyName[32], TtyName[32]; diff --git a/src/resize.c b/src/resize.c index 0e141af..73c59f3 100644 --- a/src/resize.c +++ b/src/resize.c @@ -50,14 +50,6 @@ static void kaablamm (void); static int BcopyMline (struct mline *, int, struct mline *, int, int, int); static void SwapAltScreen (struct win *); -extern struct layer *flayer; -extern struct display *display, *displays; -extern unsigned char *blank, *null; -extern struct mline mline_blank, mline_null, mline_old; -extern struct win *windows; -extern int Z0width, Z1width; -extern int captionalways; - #if defined(TIOCGWINSZ) || defined(TIOCSWINSZ) struct winsize glwz; #endif diff --git a/src/screen.c b/src/screen.c index 42e5879..c518c6f 100644 --- a/src/screen.c +++ b/src/screen.c @@ -99,29 +99,12 @@ FILE *dfp; #endif -extern char Term[], screenterm[], **environ, Termcap[]; int force_vt = 1; int VBellWait, MsgWait, MsgMinWait, SilenceWait; -extern struct acluser *users; -extern struct display *displays, *display; - -extern struct LayFuncs MarkLf; - - -extern int visual_bell; -extern unsigned char mark_key_tab[]; -extern char version[]; -extern char DefaultShell[]; -extern char *zmodem_sendcmd; -extern char *zmodem_recvcmd; -extern struct layout *layout_last; - - char *ShellProg; char *ShellArgs[2]; -extern struct NewWindow nwin_undef, nwin_default, nwin_options; struct backtick; static struct passwd *getpwbyname (char *, struct passwd *); diff --git a/src/search.c b/src/search.c index 37009d5..6ea88ac 100644 --- a/src/search.c +++ b/src/search.c @@ -35,10 +35,6 @@ #define INPUTLINE (flayer->l_height - 1) -extern struct layer *flayer; -extern struct win *fore; - - int search_ic; /******************************************************************** diff --git a/src/socket.c b/src/socket.c index b58a0b3..bc48bf9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -62,25 +62,6 @@ static void FinishAttach (struct msg *); static void FinishDetach (struct msg *); static void AskPassword (struct msg *); - -extern char *RcFileName, *extra_incap, *extra_outcap; -extern int ServerSocket, real_uid, real_gid, eff_uid, eff_gid; -extern int dflag, iflag, rflag, lsflag, quietflag, wipeflag, xflag; -extern int queryflag; -extern char *attach_tty, *LoginName, HostName[]; -extern struct display *display, *displays; -extern struct win *fore, **wtab, *console_window, *windows; -extern struct layer *flayer; -extern struct layout *layout_attach, *layout_last, layout_last_marker; -extern struct NewWindow nwin_undef; -extern char *multi; -extern int maxwin; - -extern char SockPath[]; -extern struct event serv_read; -extern char *rc_name; -extern struct comm comms[]; - #define SOCKMODE (S_IWRITE | S_IREAD | (displays ? S_IEXEC : 0) | (multi ? 1 : 0)) diff --git a/src/termcap.c b/src/termcap.c index 014f130..a4c78bd 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -31,21 +31,6 @@ #include "screen.h" #include "extern.h" -extern struct display *display, *displays; -extern int real_uid, real_gid, eff_uid, eff_gid; -extern struct term term[]; /* terminal capabilities */ -extern struct NewWindow nwin_undef, nwin_default, nwin_options; -extern int force_vt; -extern int Z0width, Z1width; -extern int hardstatusemu; -extern struct action umtab[]; -extern struct action mmtab[]; -extern struct action dmtab[]; -extern struct action ktab[]; -extern struct kmap_ext *kmap_exts; -extern int kmap_extn; -extern int DefaultEsc; - static void AddCap (char *); static void MakeString (char *, char *, int, char *); diff --git a/src/tty.sh b/src/tty.sh index 407919c..67e51d8 100644 --- a/src/tty.sh +++ b/src/tty.sh @@ -93,10 +93,7 @@ exit 0 # include #endif -extern struct display *display, *displays; -extern int iflag; #if (!defined(TIOCCONS) && defined(SRIOCSREDIR)) || defined(linux) -extern struct win *console_window; static void consredir_readev_fn (struct event *, char *); #endif diff --git a/src/utmp.c b/src/utmp.c index 62953b6..02e5867 100644 --- a/src/utmp.c +++ b/src/utmp.c @@ -39,15 +39,6 @@ #endif -extern struct display *display; -#ifdef CAREFULUTMP -extern struct win *windows; -#endif -extern struct win *fore; -extern char *LoginName; -extern int real_uid, eff_uid; - - /* * UTNOKEEP: A (ugly) hack for apollo that does two things: * 1) Always close and reopen the utmp file descriptor. (I don't know @@ -106,21 +97,6 @@ static char UtmpName[] = UTMPFILE; static int utmpfd = -1; #endif - -# if defined(GETUTENT) && (!defined(SVR4) || defined(__hpux)) && ! defined(__CYGWIN__) -# if defined(hpux) /* cruel hpux release 8.0 */ -# define pututline _pututline -# endif /* hpux */ -extern struct utmp *getutline(), *pututline(); -# if defined(_SEQUENT_) -extern struct utmp *ut_add_user(), *ut_delete_user(); -extern char *ut_find_host(); -# ifndef UTHOST -# define UTHOST /* _SEQUENT_ has ut_find_host() */ -# endif -# endif /* _SEQUENT_ */ -# endif /* GETUTENT && !SVR4 */ - # if !defined(GETUTENT) && !defined(UT_UNSORTED) # ifdef GETTTYENT # include diff --git a/src/viewport.c b/src/viewport.c index f477974..1a7ce8c 100644 --- a/src/viewport.c +++ b/src/viewport.c @@ -31,8 +31,6 @@ #include "extern.h" #include "viewport.h" -extern struct display *display; - int RethinkDisplayViewports() { diff --git a/src/window.c b/src/window.c index 7585870..2672bab 100644 --- a/src/window.c +++ b/src/window.c @@ -43,38 +43,6 @@ #include "extern.h" #include "logfile.h" /* logfopen() */ -extern struct display *displays, *display; -extern struct win *windows, *fore, *console_window; -extern char *ShellArgs[]; -extern char *ShellProg; -extern char screenterm[]; -extern char *screenlogfile; -extern char HostName[]; -extern int TtyMode; -extern int SilenceWait; -extern int real_uid, real_gid, eff_uid, eff_gid; -extern char Termcap[]; -extern char **NewEnv; -extern int visual_bell, maxwin; -extern struct event logflushev; -extern int log_flush, logtstamp_after; -extern int ZombieKey_destroy, ZombieKey_resurrect, ZombieKey_onerror; -extern struct layer *flayer; -extern int maxusercount; -extern int pty_preopen; -extern int zmodem_mode; -extern struct mchar mchar_blank; -extern char *zmodem_sendcmd; -extern char *zmodem_recvcmd; - -#if defined(TIOCSWINSZ) || defined(TIOCGWINSZ) -extern struct winsize glwz; -#endif - -#ifdef O_NOCTTY -extern int separate_sids; -#endif - static void WinProcess (char **, int *); static void WinRedisplayLine (int, int, int, int); static void WinClearLine (int, int, int, int); @@ -509,7 +477,6 @@ MakeWindow(struct NewWindow *newwin) struct NewWindow nwin; int type, startat; char *TtyName; - extern struct acluser *users; if (!wtab) { @@ -1391,8 +1358,6 @@ winexec(char **av) char *p, *s, *t; int i, r = 0, l = 0; struct win *w; - extern struct display *display; - extern struct win *windows; struct pseudowin *pwin; int type; -- cgit v1.2.1