remove osdef

inspired by 18c44170a9

put curses stuff it term.sh, it's actually in /usr/include/term.h
but it will mess up build if included directly
This commit is contained in:
Amadeusz Sławiński
2010-12-01 19:52:36 +01:00
parent b296029332
commit 0c334bcf3c
5 changed files with 47 additions and 317 deletions

View File

@@ -120,7 +120,7 @@ uninstall: .version
shadow:
mkdir shadow;
cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc .
rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h
rm -f shadow/term.h shadow/tty.c shadow/comm.h
echo "install all Makefiles and config:" > shadow/Makefile
echo " rm -f config.cache" >> shadow/Makefile
echo " sh ./configure" >> shadow/Makefile
@@ -136,9 +136,6 @@ tty.c: tty.sh
comm.h: comm.c comm.sh config.h
AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
osdef.h: osdef.sh config.h osdef.h.in
CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
docs:
cd doc; $(MAKE) dvi screen.info
@@ -146,10 +143,10 @@ dvi info screen.info:
-cd doc; $(MAKE) $@
mostlyclean:
rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed
rm -f $(OFILES) screen config.cache
clean celan: mostlyclean
rm -f tty.c term.h comm.h osdef.h kmapdef.c core
rm -f tty.c term.h comm.h kmapdef.c core
# Delete all files from the current directory that are created by
# configuring or building the program.
@@ -158,7 +155,7 @@ clean celan: mostlyclean
#distclean: mostlyclean
# rm -f $(SCREEN).tar $(SCREEN).tar.gz
# rm -f config.status Makefile
# rm -f osdef.h doc/Makefile
# rm -f doc/Makefile
maintainer-clean:
@echo "This command is not even intended for maintainers to use;"
@@ -170,7 +167,7 @@ maintainer-clean:
realclean: .version mostlyclean
rm -f $(SCREEN).tar $(SCREEN).tar.gz
rm -f config.status Makefile doc/Makefile
rm -f tty.c term.h comm.h osdef.h kmapdef.c
rm -f tty.c term.h comm.h kmapdef.c
rm -f config.h
echo "install all Makefiles and config:" > Makefile
echo " sh ./configure" >> Makefile
@@ -187,7 +184,7 @@ $(SCREEN).tar: .version term.h comm.h tty.c kmapdef.c
mkdir dist/$(SCREEN)
ln acls.h ansi.h display.h extern.h logfile.h mark.h os.h \
layer.h patchlevel.h screen.h window.h image.h \
osdef.h.in term.sh tty.sh comm.sh osdef.sh braille.h \
term.sh tty.sh comm.sh braille.h \
sched.h \
$(CFILES) \
ChangeLog COPYING INSTALL NEWS* TODO install.sh \
@@ -278,79 +275,79 @@ depend.in: $(CFILES) term.h
###############################################################################
### Dependencies:
screen.o: layout.h viewport.h canvas.h screen.c config.h screen.h os.h osdef.h ansi.h acls.h \
screen.o: layout.h viewport.h canvas.h screen.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h braille.h \
patchlevel.h logfile.h extern.h
ansi.o: layout.h viewport.h canvas.h ansi.c config.h screen.h os.h osdef.h ansi.h acls.h \
ansi.o: layout.h viewport.h canvas.h ansi.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h braille.h extern.h \
logfile.h
fileio.o: layout.h viewport.h canvas.h fileio.c config.h screen.h os.h osdef.h ansi.h acls.h \
fileio.o: layout.h viewport.h canvas.h fileio.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
mark.o: layout.h viewport.h canvas.h mark.c config.h screen.h os.h osdef.h ansi.h acls.h \
mark.o: layout.h viewport.h canvas.h mark.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h mark.h extern.h
misc.o: layout.h viewport.h canvas.h misc.c config.h screen.h os.h osdef.h ansi.h acls.h \
misc.o: layout.h viewport.h canvas.h misc.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
resize.o: layout.h viewport.h canvas.h resize.c config.h screen.h os.h osdef.h ansi.h acls.h \
resize.o: layout.h viewport.h canvas.h resize.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
socket.o: layout.h viewport.h canvas.h socket.c config.h screen.h os.h osdef.h ansi.h acls.h \
socket.o: layout.h viewport.h canvas.h socket.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h ansi.h acls.h \
search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h mark.h extern.h
tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h ansi.h acls.h comm.h \
layer.h term.h image.h display.h window.h extern.h
term.o: layout.h viewport.h canvas.h term.c term.h
window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \
window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
loadav.o: layout.h viewport.h canvas.h loadav.c config.h screen.h os.h osdef.h ansi.h acls.h \
loadav.o: layout.h viewport.h canvas.h loadav.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
putenv.o: layout.h viewport.h canvas.h putenv.c config.h
help.o: layout.h viewport.h canvas.h help.c config.h screen.h os.h osdef.h ansi.h acls.h \
help.o: layout.h viewport.h canvas.h help.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h list_generic.h
termcap.o: layout.h viewport.h canvas.h termcap.c config.h screen.h os.h osdef.h ansi.h acls.h \
termcap.o: layout.h viewport.h canvas.h termcap.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
input.o: layout.h viewport.h canvas.h input.c config.h screen.h os.h osdef.h ansi.h acls.h \
input.o: layout.h viewport.h canvas.h input.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
attacher.o: layout.h viewport.h canvas.h attacher.c config.h screen.h os.h osdef.h ansi.h \
attacher.o: layout.h viewport.h canvas.h attacher.c config.h screen.h os.h ansi.h \
acls.h comm.h layer.h term.h image.h display.h window.h extern.h
pty.o: layout.h viewport.h canvas.h pty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
pty.o: layout.h viewport.h canvas.h pty.c config.h screen.h os.h ansi.h acls.h comm.h \
layer.h term.h image.h display.h window.h extern.h
process.o: layout.h viewport.h canvas.h process.c config.h screen.h os.h osdef.h ansi.h acls.h \
process.o: layout.h viewport.h canvas.h process.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
display.o: layout.h viewport.h canvas.h display.c config.h screen.h os.h osdef.h ansi.h acls.h \
display.o: layout.h viewport.h canvas.h display.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h braille.h
canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h ansi.h acls.h \
canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h \
braille.h
comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h
kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h
acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h ansi.h acls.h comm.h \
layer.h term.h image.h display.h window.h extern.h
braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h braille.h
braille_tsi.o: layout.h viewport.h canvas.h braille_tsi.c config.h screen.h os.h osdef.h ansi.h \
braille_tsi.o: layout.h viewport.h canvas.h braille_tsi.c config.h screen.h os.h ansi.h \
acls.h comm.h layer.h term.h image.h display.h window.h extern.h \
braille.h
logfile.o: layout.h viewport.h canvas.h logfile.c config.h screen.h os.h osdef.h ansi.h acls.h \
logfile.o: layout.h viewport.h canvas.h logfile.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
layer.o: layout.h viewport.h canvas.h layer.c config.h screen.h os.h osdef.h ansi.h acls.h \
layer.o: layout.h viewport.h canvas.h layer.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
sched.o: layout.h viewport.h canvas.h sched.c config.h screen.h os.h osdef.h ansi.h acls.h \
sched.o: layout.h viewport.h canvas.h sched.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
teln.o: layout.h viewport.h canvas.h teln.c config.h screen.h os.h osdef.h ansi.h acls.h \
teln.o: layout.h viewport.h canvas.h teln.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
nethack.o: layout.h viewport.h canvas.h nethack.c config.h screen.h os.h osdef.h ansi.h acls.h \
nethack.o: layout.h viewport.h canvas.h nethack.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
encoding.o: layout.h viewport.h canvas.h encoding.c config.h screen.h os.h osdef.h ansi.h acls.h \
encoding.o: layout.h viewport.h canvas.h encoding.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h
layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h ansi.h acls.h \
layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h \
braille.h
viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h \
braille.h
list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h
list_generic.o: list_generic.h list_generic.c layer.h screen.h
list_display.o: list_generic.h list_display.c layer.h screen.h
list_window.o: list_generic.h list_window.c window.h layer.h screen.h

View File

@@ -1,201 +0,0 @@
/* Copyright (c) 1993-2000
* Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
* Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
* Copyright (c) 1987 Oliver Laumann
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (see the file COPYING); if not, see
* http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
****************************************************************
* $Id$ GNU
*/
/****************************************************************
* Thanks to Christos S. Zoulas (christos@ee.cornell.edu) who
* mangled the screen source through 'gcc -Wall'.
****************************************************************
*/
extern int printf __P((char *, ...));
extern int fprintf __P((FILE *, char *, ...));
extern int sprintf __P((char *, char *, ...));
#ifdef USEVARARGS
extern int vsprintf __P((char *, char *, char *));
#endif
#ifdef LOG_NOTICE
extern int openlog __P((char *, int, int));
extern int syslog __P((int, char *, ... ));
extern int closelog __P((void));
#endif
#if defined(sun) || defined(_SEQUENT_)
extern int _flsbuf __P((int, FILE *));
#endif
#ifdef SYSV
extern char *strchr __P((char *, int));
extern char *strrchr __P((char *, int));
extern char *memset __P((char *, int, int));
extern int memcmp __P((char *, char *, int));
#else
extern char *index __P((char *, int));
extern char *rindex __P((char *, int));
extern void bzero __P((char *, int));
extern int bcmp __P((char *, char *, int));
extern int killpg __P((int, int));
#endif
#ifndef USEBCOPY
# ifdef USEMEMCPY
extern void memcpy __P((char *, char *, int));
# else
# ifdef USEMEMMOVE
extern void memmove __P((char *, char *, int));
# else
extern void bcopy __P((char *, char *, int));
# endif
# endif
#else
extern void bcopy __P((char *, char *, int));
#endif
#ifdef BSDWAIT
struct rusage; /* for wait3 __P */
union wait; /* for wait3 __P */
extern int wait3 __P((union wait *, int, struct rusage *));
#else
extern int waitpid __P((int, int *, int));
#endif
extern int getdtablesize __P((void));
#ifdef HAVE_SETRESUID
extern int setresuid __P((int, int, int));
extern int setresgid __P((int, int, int));
#endif
#ifdef HAVE_SETREUID
extern int setreuid __P((int, int));
extern int setregid __P((int, int));
#endif
#ifdef HAVE_SETEUID
extern int seteuid __P((int));
extern int setegid __P((int));
#endif
extern char *crypt __P((char *, char *));
extern int putenv __P((char *));
extern int tgetent __P((char *, char *));
extern char *tgetstr __P((char *, char **));
extern int tgetnum __P((char *));
extern int tgetflag __P((char *));
extern void tputs __P((char *, int, int (*)(int)));
extern char *tgoto __P((char *, int, int));
#ifdef POSIX
#include <string.h>
extern int setsid __P((void));
extern int setpgid __P((int, int));
extern int tcsetpgrp __P((int, int));
#endif
extern int ioctl __P((int, int, char *));
extern int kill __P((int, int));
extern int getpid __P((void));
extern int getuid __P((void));
extern int geteuid __P((void));
extern int getgid __P((void));
extern int getegid __P((void));
struct passwd; /* for getpwuid __P */
extern struct passwd *getpwuid __P((int));
extern struct passwd *getpwnam __P((char *));
extern int isatty __P((int));
extern int chown __P((char *, int, int));
extern int rename __P((char *, char *));
extern int gethostname __P((char *, int));
extern int lseek __P((int, int, int));
extern void exit __P((int));
extern char *getwd __P((char *));
extern char *getenv __P((char *));
extern time_t time __P((time_t *));
extern char *getpass __P((char *));
extern char *getlogin __P((void));
extern char *ttyname __P((int));
extern int fputs __P((char *, FILE *));
extern int fwrite __P((char *, int, int, FILE *));
extern int fflush __P((FILE *));
extern int fclose __P((FILE *));
extern char *malloc __P((int));
extern char *realloc __P((char *, int));
extern void free __P((char *));
#ifdef NAMEDPIPE
extern int mknod __P((char *, int, int));
#else
struct sockaddr; /* for connect __P */
extern int socket __P((int, int, int));
extern int connect __P((int, struct sockaddr *, int));
extern int bind __P((int, struct sockaddr *, int));
extern int listen __P((int, int));
extern int accept __P((int, struct sockaddr *, int *));
#endif
#if defined(UTMPOK) && defined(GETUTENT)
extern void setutent __P((void));
#endif
#if defined(sequent) || defined(_SEQUENT_)
extern int getpseudotty __P((char **, char **));
#ifdef _SEQUENT_
extern int fvhangup __P((char *));
#endif
#endif
struct timeval; /* for select __P */
extern int select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *));
#ifdef HAVE_UTIMES
extern int utimes __P((char *, struct timeval *));
#endif
extern void unsetenv __P((char *));
# if defined(GETTTYENT) && !defined(GETUTENT) && !defined(UTNOKEEP)
struct ttyent; /* for getttyent __P */
extern void setttyent __P((void));
extern struct ttyent *getttyent __P((void));
# endif
#ifdef SVR4
struct rlimit; /* for getrlimit __P */
extern int getrlimit __P((int, struct rlimit *));
#endif
struct stat;
extern int stat __P((char *, struct stat *));
extern int lstat __P((char *, struct stat *));
extern int fstat __P((int, struct stat *));
extern int fchmod __P((int, int));
extern int fchown __P((int, int, int));
#if defined(LOADAV) && defined(LOADAV_GETLOADAVG)
extern int getloadavg(double *, int);
#endif

View File

@@ -1,71 +0,0 @@
#! /bin/sh
if test -z "$CPP"; then
CPP="cc -E"
fi
if test -z "$srcdir"; then
srcdir=.
fi
rm -f core*
sed < $srcdir/osdef.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([^ *]*\) __P.*@/[)*, ]\1[ (]/i\\\
\\/\\[^a-zA-Z_\\]\1 __P\\/d@p' > osdef1.sed
cat << EOF > osdef0.c
#include "config.h"
#include <sys/types.h>
#include <stdio.h>
#include <signal.h>
#include <sys/stat.h>
#include <pwd.h>
#ifdef SHADOWPW
#include <shadow.h>
#endif
#ifndef sun
#include <sys/ioctl.h>
#endif
#ifdef linux
#include <string.h>
#include <stdlib.h>
#endif
#ifndef NAMEDPIPE
#include <sys/socket.h>
#endif
#ifndef NOSYSLOG
#include <syslog.h>
#endif
#include "os.h"
#if defined(UTMPOK) && defined (GETTTYENT) && !defined(GETUTENT)
#include <ttyent.h>
#endif
#ifdef SVR4
# include <sys/resource.h>
#endif
EOF
cat << EOF > osdef2.sed
1i\\
/*
1i\\
* This file is automagically created from osdef.sh -- DO NOT EDIT
1i\\
*/
EOF
$CPP -I. -I$srcdir osdef0.c | sed -n -f osdef1.sed >> osdef2.sed
sed -f osdef2.sed < $srcdir/osdef.h.in > osdef.h
rm osdef0.c osdef1.sed osdef2.sed
if test -f core*; then
file core*
echo " Sorry, your sed is broken. Call the system administrator."
echo " Meanwhile, you may try to compile screen with an empty osdef.h file."
echo " But if your compiler needs to have all functions declared, you should"
echo " retry 'make' now and only remove offending lines from osdef.h later."
exit 1
fi
if eval test "`diff osdef.h $srcdir/osdef.h.in | wc -l`" -eq 4; then
echo " Hmm, sed is very pessimistic about your system header files."
echo " But it did not dump core -- strange! Let's continue carefully..."
echo " If this fails, you may want to remove offending lines from osdef.h"
echo " or try with an empty osdef.h file, if your compiler can do without"
echo " function declarations."
fi

View File

@@ -29,8 +29,6 @@
#include "os.h"
#include "osdef.h"
#include "ansi.h"
#include "sched.h"
#include "acls.h"

View File

@@ -20,6 +20,13 @@ cat << EOF > term.h
#define T_NUM 1
#define T_STR 2
extern int tgetent(char *, const char *);
extern int tgetflag(char *);
extern int tgetnum(char *);
extern char *tgetstr(char *, char **);
extern char *tgoto(const char *, int, int);
extern int tputs(const char *, int, int (*)(int));
struct term
{
char *tcname;