install in /usr/local heirarchy and compile cleanly under 4.4bsd

This commit is contained in:
Paul Traina 1994-10-27 21:51:48 +00:00
parent 31260ac9d0
commit 409a3a2221
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=284

View file

@ -0,0 +1,176 @@
*** Makefile Tue Oct 4 22:47:03 1994
--- Makefile Thu Oct 27 14:46:17 1994
***************
*** 4,13 ****
PROG= tftpd
MAN8= tftpd.8
! ETCDIR?=${DESTDIR}/etc
! BINDIR?=${DESTDIR}/usr/libexec
! CFLAGS+=-DCONFIGFILE='"${ETCDIR}/tftpd.conf"'
classes/libclasses.a:
(cd classes ; make)
--- 4,14 ----
PROG= tftpd
MAN8= tftpd.8
! ETCDIR=${DESTDIR}/usr/local/etc
! BINDIR=${DESTDIR}/usr/local/libexec
! MANDIR=${DESTDIR}/usr/local/man/man
! CFLAGS+=-DCONFIGFILE='"${ETCDIR}/tftpd.conf"' -DHAVE_STRERROR
classes/libclasses.a:
(cd classes ; make)
*** classes/Makefile Tue Oct 4 22:33:02 1994
--- classes/Makefile Thu Oct 27 14:43:57 1994
***************
*** 6,9 ****
--- 6,12 ----
NOPIC= true
NOPROFILE=true
+ install:
+ @echo not installing library
+
.include <bsd.lib.mk>
*** tftpd.c Tue Oct 4 22:20:49 1994
--- tftpd.c Thu Oct 27 14:36:32 1994
***************
*** 500,509 ****
/* Rules 6&7:
*/
if (stat(filename, &stbuf) < 0) {
- extern char* sys_errlist[];
if (tftpDebugLevel > 1)
syslog(LOG_DEBUG, "stat '%s' fails: %s",
! filename, sys_errlist[errno]);
return (errno == ENOENT ? ENOTFOUND : EACCESS);
}
--- 500,508 ----
/* Rules 6&7:
*/
if (stat(filename, &stbuf) < 0) {
if (tftpDebugLevel > 1)
syslog(LOG_DEBUG, "stat '%s' fails: %s",
! filename, strerror(errno));
return (errno == ENOENT ? ENOTFOUND : EACCESS);
}
***************
*** 763,774 ****
syslog(LOG_ERR, "nak: %m\n");
}
/* Here if you need it */
char* strerror(n)
int n;
{
! extern char* sys_errlist[];
! extern int errno, sys_nerr;
!
return n > sys_nerr ? "unknown error" : sys_errlist[n];
}
--- 762,773 ----
syslog(LOG_ERR, "nak: %m\n");
}
+ #ifndef HAVE_STRERROR
/* Here if you need it */
char* strerror(n)
int n;
{
! extern int sys_nerr;
return n > sys_nerr ? "unknown error" : sys_errlist[n];
}
+ #endif
*** tftpyale.c Tue Oct 4 22:20:49 1994
--- tftpyale.c Thu Oct 27 14:37:03 1994
***************
*** 232,238 ****
if ((configf = fopen (fileName, "r")) == NULL) {
syslog (LOG_ERR,
"Cannot open configFile '%s'; reason = %s",
! fileName, sys_errlist[errno]);
return 0;
}
}
--- 232,238 ----
if ((configf = fopen (fileName, "r")) == NULL) {
syslog (LOG_ERR,
"Cannot open configFile '%s'; reason = %s",
! fileName, strerror(errno));
return 0;
}
}
***************
*** 278,284 ****
if (tftpDebugLevel > 0) {
syslog (LOG_DEBUG,
"chdir fails; '%s'",
! sys_errlist[errno]);
}
}
else
--- 278,284 ----
if (tftpDebugLevel > 0) {
syslog (LOG_DEBUG,
"chdir fails; '%s'",
! strerror(errno));
}
}
else
***************
*** 290,296 ****
if (cargc == 2) {
if (access(cargv[1], 0) != 0)
syslog(LOG_DEBUG, "directory '%s': %s",
! cargv[1], sys_errlist[errno]);
else
tftpRootDirectory = newString(cargv[1]);
}
--- 290,296 ----
if (cargc == 2) {
if (access(cargv[1], 0) != 0)
syslog(LOG_DEBUG, "directory '%s': %s",
! cargv[1], strerror(errno));
else
tftpRootDirectory = newString(cargv[1]);
}
*** tftpyale.h Tue Oct 4 22:18:20 1994
--- tftpyale.h Thu Oct 27 14:38:14 1994
***************
*** 22,33 ****
#ifdef __STDC__
extern int errno;
extern void* malloc(unsigned);
- extern char* sys_errlist[];
extern char* strchr(const char*, int);
#else
extern int errno;
extern char* malloc();
- extern char* sys_errlist[];
extern char* index();
# define strchar(S,C) index(S,C)
#endif
--- 22,38 ----
#ifdef __STDC__
extern int errno;
extern void* malloc(unsigned);
extern char* strchr(const char*, int);
+ # ifndef HAVE_STRERROR
+ extern char* strerror(int);
+ # endif
#else
extern int errno;
extern char* malloc();
extern char* index();
+ # ifndef HAVE_STRERROR
+ extern char* strerror();
+ # endif
# define strchar(S,C) index(S,C)
#endif
+